vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-01 00:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes inactive hosts filters, labels and counters (#7658 #7657)

Browse source
This commit is contained in:
Matteo Biscosi 2023-07-12 09:41:27 +00:00
parent 7f24b2cca4
commit e10aacf1df
4 changed files with 101 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

111
scripts/lua/modules/inactive_hosts_utils.lua
View file

@ -12,6 +12,30 @@ local inactive_hosts_utils = {}
-- ##########################################
-- Function used to check if the host has to be filtered out or not
-- return true in case the host is okey, false in case it has to be filtered out
local function check_filters(host_info, filters)
local mac_manufacturer = ntop.getMacManufacturer(host_info.mac) or {}
local filters_ok = true
for filter, value in pairs(filters or {}) do
if filter == "manufacturer" then
if mac_manufacturer.extended ~= value then
filters_ok = false
goto skip
end
elseif tostring(host_info[filter]) ~= tostring(value) then
filters_ok = false
goto skip
end
end
::skip::
return filters_ok
end
-- ##########################################
-- This function return a list of inactive hosts, with all the informations
function inactive_hosts_utils.getInactiveHosts(ifid, filters)
local redis_hash = string.format(OFFLINE_LOCAL_HOSTS_KEY, ifid)
@ -28,14 +52,8 @@ function inactive_hosts_utils.getInactiveHosts(ifid, filters)
local mac_manufacturer = ntop.getMacManufacturer(host_info.mac) or {}
local mac_manufacturer_label = ""
for filter, value in pairs(filters or {}) do
if filter == "manufacturer" then
if mac_manufacturer.short ~= value then
goto skip
end
elseif tostring(host_info[filter]) ~= tostring(value) then
goto skip
end
if not check_filters(host_info, filters) then
goto skip
end
for n, ns in pairs(networks_stats) do
@ -91,6 +109,7 @@ end
-- ##########################################
-- Return the inactive host number
function inactive_hosts_utils.getInactiveHostsNumber(ifid, filters)
local redis_hash = string.format(OFFLINE_LOCAL_HOSTS_KEY, ifid)
local available_keys = ntop.getHashKeysCache(redis_hash) or {}
@ -106,16 +125,10 @@ function inactive_hosts_utils.getInactiveHostsNumber(ifid, filters)
if not isEmptyString(host_info_json) then
local host_info = json.decode(host_info_json)
local last_seen = host_info.last_seen
local mac_manufacturer = ntop.getMacManufacturer(host_info.mac) or {}
for filter, value in pairs(filters) do
if filter == "manufacturer" then
if mac_manufacturer.short ~= value then
goto skip
end
elseif tostring(host_info[filter]) ~= tostring(value) then
goto skip
end
-- Exclude those that do not follow the filters
if not check_filters(host_info, filters) then
goto skip
end
count = count + 1
@ -132,7 +145,7 @@ end
-- ##########################################
-- This function return a list of available VLAN filters
function inactive_hosts_utils.getVLANFilters(ifid)
function inactive_hosts_utils.getVLANFilters(ifid, filters)
local redis_hash = string.format(OFFLINE_LOCAL_HOSTS_KEY, ifid)
local available_keys = ntop.getHashKeysCache(redis_hash) or {}
local vlan_list = {}
@ -143,14 +156,23 @@ function inactive_hosts_utils.getVLANFilters(ifid)
if not isEmptyString(host_info_json) then
local host_info = json.decode(host_info_json)
-- Exclude those that do not follow the filters
if not check_filters(host_info, filters) then
goto skip
end
if not (vlan_list[host_info.vlan]) then
vlan_list[host_info.vlan] = 1
else
vlan_list[host_info.vlan] = vlan_list[host_info.vlan] + 1
end
::skip::
end
end
-- Add the vlan names
for vlan, count in pairsByKeys(vlan_list) do
local vlan_name = ''
if vlan == 0 then
@ -169,6 +191,7 @@ function inactive_hosts_utils.getVLANFilters(ifid)
}
end
-- Add the "all" entry
table.insert(rsp, 1, {
key = "vlan_id",
value = "",
@ -181,7 +204,7 @@ end
-- ##########################################
-- This function return a list of available network filters
function inactive_hosts_utils.getNetworkFilters(ifid)
function inactive_hosts_utils.getNetworkFilters(ifid, filters)
local redis_hash = string.format(OFFLINE_LOCAL_HOSTS_KEY, ifid)
local available_keys = ntop.getHashKeysCache(redis_hash) or {}
local networks_stats = interface.getNetworksStats()
@ -195,14 +218,22 @@ function inactive_hosts_utils.getNetworkFilters(ifid)
if not isEmptyString(host_info_json) then
local host_info = json.decode(host_info_json)
-- Exclude those that do not follow the filters
if not check_filters(host_info, filters) then
goto skip
end
if not (network_list[host_info.network]) then
network_list[host_info.network] = 1
else
network_list[host_info.network] = network_list[host_info.network] + 1
end
::skip::
end
end
-- Format the networks name
for network, count in pairsByKeys(network_list) do
local network_name
for n, ns in pairs(networks_stats) do
@ -218,6 +249,7 @@ function inactive_hosts_utils.getNetworkFilters(ifid)
label = tostring(network_name or network)
}
end
-- Add the "all" entry
table.insert(rsp, 1, {
key = "network",
value = "",
@ -230,7 +262,7 @@ end
-- ##########################################
-- This function return a list of available device filters
function inactive_hosts_utils.getDeviceFilters(ifid)
function inactive_hosts_utils.getDeviceFilters(ifid, filters)
local discover_utils = require "discover_utils"
local redis_hash = string.format(OFFLINE_LOCAL_HOSTS_KEY, ifid)
local available_keys = ntop.getHashKeysCache(redis_hash) or {}
@ -244,6 +276,11 @@ function inactive_hosts_utils.getDeviceFilters(ifid)
local host_info = json.decode(host_info_json)
local dev_name = discover_utils.devtype2string(host_info.device_type)
-- Exclude those that do not follow the filters
if not check_filters(host_info, filters) then
goto skip
end
if not (device_list[dev_name]) then
device_list[dev_name] = {
count = 1,
@ -252,6 +289,8 @@ function inactive_hosts_utils.getDeviceFilters(ifid)
else
device_list[dev_name].count = device_list[dev_name].count + 1
end
::skip::
end
end
@ -263,6 +302,7 @@ function inactive_hosts_utils.getDeviceFilters(ifid)
label = device
}
end
-- Add "all" entry
table.insert(rsp, 1, {
key = "device_type",
value = "",
@ -287,18 +327,15 @@ function inactive_hosts_utils.getManufacturerFilters(ifid, filters)
if not isEmptyString(host_info_json) then
local host_info = json.decode(host_info_json)
local mac_manufacturer = ntop.getMacManufacturer(host_info.mac) or {}
local tmp = mac_manufacturer.short
local tmp = mac_manufacturer.extended
if filters then
for filter, value in pairs(filters) do
if filter == "manufacturer" then
if mac_manufacturer.short ~= value then
goto skip
end
elseif tostring(host_info[filter]) ~= tostring(value) then
goto skip
end
end
if isEmptyString(tmp) then
tmp = mac_manufacturer.short
end
-- Exclude those that do not follow the filters
if not check_filters(host_info, filters) then
goto skip
end
if tmp then
@ -548,16 +585,10 @@ function inactive_hosts_utils.getInactiveHostsEpochDistribution(ifid, filters)
if not isEmptyString(host_info_json) then
local host_info = json.decode(host_info_json)
local last_seen = host_info.last_seen
local mac_manufacturer = ntop.getMacManufacturer(host_info.mac) or {}
for filter, value in pairs(filters or {}) do
if filter == "manufacturer" then
if mac_manufacturer.short ~= value then
goto skip
end
elseif tostring(host_info[filter]) ~= tostring(value) then
goto skip
end
-- Exclude those that do not follow the filters
if not check_filters(host_info, filters) then
goto skip
end
if last_seen >= one_hour_epoch then