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

Fixed DNS report

Browse source
This commit is contained in:
Luca Deri 2021-02-28 12:59:54 +01:00
parent 1a4c7c2388
commit ed938dc6c1
2 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

43
scripts/lua/hosts_map.lua
View file

@ -26,16 +26,16 @@ print("<h2 class='mb-4'>"..i18n("hosts_map").."</h2>")
-- https://www.d3-graph-gallery.com/graph/bubble_template.html
local modes = {
{ mode = 0, label = i18n("hosts_map_page.all_flows") },
{ mode = 9, label = i18n("hosts_map_page.active_alert_flows") },
{ mode = 3, label = i18n("hosts_map_page.dns_queries") },
{ mode = 4, label = i18n("hosts_map_page.syn_distribution") },
{ mode = 5, label = i18n("hosts_map_page.syn_vs_rst") },
{ mode = 6, label = i18n("hosts_map_page.syn_vs_synack") },
{ mode = 7, label = i18n("hosts_map_page.tcp_pkts_sent_vs_rcvd") },
{ mode = 8, label = i18n("hosts_map_page.tcp_bytes_sent_vs_rcvd") },
{ mode = 2, label = i18n("hosts_map_page.alerted_flows") },
{ mode = 1, label = i18n("hosts_map_page.unreach_flows") }
{ mode = 0, label = i18n("hosts_map_page.all_flows") },
{ mode = 9, label = i18n("hosts_map_page.active_alert_flows") },
{ mode = 3, label = i18n("hosts_map_page.dns_queries") },
{ mode = 4, label = i18n("hosts_map_page.syn_distribution") },
{ mode = 5, label = i18n("hosts_map_page.syn_vs_rst") },
{ mode = 6, label = i18n("hosts_map_page.syn_vs_synack") },
{ mode = 7, label = i18n("hosts_map_page.tcp_pkts_sent_vs_rcvd") },
{ mode = 8, label = i18n("hosts_map_page.tcp_bytes_sent_vs_rcvd") },
{ mode = 2, label = i18n("hosts_map_page.alerted_flows") },
{ mode = 1, label = i18n("hosts_map_page.unreach_flows") }
}
local show_remote = true
@ -50,9 +50,9 @@ local bubble_mode = tonumber(_GET["bubble_mode"]) or 0
local current_label
for _, mode in ipairs(modes) do
if mode.mode == bubble_mode then
current_label = mode.label
end
if mode.mode == bubble_mode then
current_label = mode.label
end
end
if(bubble_mode == 0) then
@ -111,14 +111,17 @@ function processHost(hostname, host)
end
elseif(bubble_mode == 2) then
if((host["alerted_flows.as_server"] ~= nil)
and (host["alerted_flows.as_client"] ~= nil)
and (host["alerted_flows.as_client"] ~= nil)
and (host["alerted_flows.as_server"] + host["alerted_flows.as_client"] > 0)) then
line = { link = hostname, label = label, x = host["alerted_flows.as_server"], y = host["alerted_flows.as_client"], r = host["alerted_flows.as_server"] + host["alerted_flows.as_client"] }
-- if(label == "74.125.20.109") then tprint(line) end
end
elseif(bubble_mode == 3) then
if((host["dns"] ~= nil) and ((host["dns"]["sent"]["num_queries"]+host["dns"]["rcvd"]["num_queries"]) > 0)) then
line = { link = hostname, label = label, x = host["dns"]["rcvd"]["num_replies_ok"], y = host["dns"]["sent"]["num_queries"], r = host["dns"]["rcvd"]["num_replies_error"] }
local x = host["dns"]["rcvd"]["num_replies_ok"]
local y = host["dns"]["sent"]["num_queries"]
line = { link = hostname, label = label, x = x, y = y, r = x+y }
end
elseif(bubble_mode == 4) then
local stats = interface.getHostInfo(host["ip"],host["vlan"])
@ -194,11 +197,11 @@ print ([[
<ul class="dropdown-menu dropdown-menu-right scrollable-dropdown" role="menu" aria-labelledby="menu1">
]])
for i,v in pairs(modes) do
print('<a class="dropdown-item '.. (bubble_mode == v.mode and 'active' or '') ..'" tabindex="-1" href="?bubble_mode='..tostring(v.mode)..'">'..v.label..'</a>')
end
for i,v in pairs(modes) do
print('<a class="dropdown-item '.. (bubble_mode == v.mode and 'active' or '') ..'" tabindex="-1" href="?bubble_mode='..tostring(v.mode)..'">'..v.label..'</a>')
end
print [[
print [[
</ul>
</div>
</div>
@ -244,7 +247,7 @@ grey: 'rgba(201, 203, 207, 0.45)'
]]
if(show_remote == true) then
print [[
print [[
{
label: ']] print(remote_label) print [[',
data: ]] print(remote_js) print [[,