vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-06 03:45:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixes geomap wrongly filtering results

Browse source 
Fixes #5526
This commit is contained in:
Simone Mainardi 2021-06-21 17:35:53 +02:00
parent 6549d19a99
commit c8f22694ae
4 changed files with 12 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

111
scripts/lua/get_geo_hosts.lua
View file

@ -15,7 +15,7 @@ local response = {}
local host_key = _GET["host"] or ""
local host_info = url2hostinfo(_GET)
local MAX_HOSTS = 100
local MAX_HOSTS = 512
local function is_localizable(host)
return host and host["ip"] and not host["privatehost"] and not host["is_multicast"] and not host["is_broadcast"] and not isBroadMulticast(host["ip"])
@ -32,111 +32,6 @@ local function get_max_bytes_from_peers(peers)
return max
end
local function load_hosts()
local hosts = {}
if (host_info["host"] == nil) then
local hosts_stats = interface.getHostsInfo(true, "column_traffic", MAX_HOSTS)
hosts_stats = hosts_stats["hosts"]
for host_ip, host in pairs(hosts_stats) do
if is_localizable(host) then
local res = {
lat = host["latitude"],
lng = host["longitude"],
name = host_ip,
html = getFlag(host["country"])
}
if not isEmptyString(host["city"]) then
host["city"] = host["city"]
end
table.insert(hosts, res)
end
end
end
return hosts
end
-- BEGIN OLD CODE
local function load_flows(hosts_count, host_key)
local flows = {}
local peers = getTopFlowPeers(hostinfo2hostkey(host_info), MAX_HOSTS - hosts_count, nil, {detailsLevel="max"})
local max_bytes = get_max_bytes_from_peers(peers)
local min_threshold = 0
for key, value in pairs(peers) do
local flow = {}
local bytes = value["bytes"]
local percentage = (bytes * 100) / max_bytes
local client = {
lat = value["cli.latitude"],
lng = value["cli.longitude"]
}
local is_public = (not(value["cli.private"] and value["srv.private"]) and
not(isBroadMulticast(value["cli.ip"])) and
not(isBroadMulticast(value["srv.ip"])))
if not is_public then goto continue end
if (percentage >= min_threshold) and (client.lat ~= nil) and (client.lng ~= nil) then
-- set up the client informations
-- if the client is private then disable his rendering
client["isDrawable"] = not(value["cli.private"])
-- check if the client is the root
client["isRoot"] = (value["cli.ip"] == host_key);
if not isEmptyString(value["cli.city"]) then
client["city"] = value["cli.city"]
end
client["html"] = getFlag(value["cli.country"])
client["name"] = hostinfo2hostkey(value, "cli")
-- set up the server informations
local server = {
lat = value["srv.latitude"],
lng = value["srv.longitude"],
isDrawable = not(value["srv.private"]),
isRoot = (value["srv.ip"] == host_key),
html = getFlag(value["srv.country"]),
name = hostinfo2hostkey(value, "srv")
}
if not isEmptyString(value["srv.city"]) then
server["city"] = value["srv.city"]
end
flow["client"] = client
flow["server"] = server
flow["flow"] = percentage
flow["html"] = hostinfo2hostkey(value, "cli").." -> "..hostinfo2hostkey(value, "srv")
end
table.insert(flows, flow)
::continue::
end
return flows
end
-- Initialize host array object
-- response["hosts"] = load_hosts()
-- response["flows"] = load_flows(table.len(response["hosts"]), host_key)
-- print(json.encode(response))
-- END OLD CODE
-- ############################################################
local function handlePeer(prefix, host_key, value)
@ -187,10 +82,8 @@ end
local function show_hosts(hosts_count, host_key)
local hosts = {}
if((host_key == nil) or (host_key == "")) then
local what = interface.getHostsInfo(true, "column_traffic", MAX_HOSTS)
local what = interface.getPublicHostsInfo(true, "column_traffic", MAX_HOSTS)
for key,value in pairs(what.hosts) do
local h = handleHost(key, value)