vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 16:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Handles VLANs and traffic profiles in db queries

Browse source 
Fixes #1320
Fixes #946
This commit is contained in:
Simone Mainardi 2017-07-25 18:52:01 +02:00
parent 5a0855bd7c
commit 990915f3b3
7 changed files with 145 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

10
scripts/lua/modules/graph_utils.lua
View file

@ -717,12 +717,14 @@ if ntop.getPrefs().is_dump_flows_to_mysql_enabled
and not string.starts(host, 'vlan:')
and not string.starts(host, 'asn:')
then
local k2info = hostkey2hostinfo(host)
print('<div class="tab-pane fade" id="historical-flows">')
if tonumber(start_time) ~= nil and tonumber(end_time) ~= nil then
-- if both start_time and end_time are vaid epoch we can print finer-grained top flows
historicalFlowsTab(ifid, (host or ''), start_time, end_time, rrdFile, '', '', '', 5, 5)
historicalFlowsTab(ifid, k2info["host"] or '', start_time, end_time, rrdFile, '', '', '', k2info["vlan"])
else
printGraphTopFlows(ifid, (host or ''), _GET["epoch"], zoomLevel, rrdFile)
printGraphTopFlows(ifid, k2info["host"] or '', _GET["epoch"], zoomLevel, rrdFile, k2info["vlan"])
end
print('</div>')
end
@ -1080,7 +1082,7 @@ function dumpSingleTreeCounters(basedir, label, host, verbose)
end
end
function printGraphTopFlows(ifId, host, epoch, zoomLevel, l7proto)
function printGraphTopFlows(ifId, host, epoch, zoomLevel, l7proto, vlan)
-- Check if the DB is enabled
rsp = interface.execSQLQuery("show tables")
if(rsp == nil) then return end
@ -1092,7 +1094,7 @@ function printGraphTopFlows(ifId, host, epoch, zoomLevel, l7proto)
epoch_end = epoch
epoch_begin = epoch-d
historicalFlowsTab(ifId, host, epoch_begin, epoch_end, l7proto, '', '', '')
historicalFlowsTab(ifId, host, epoch_begin, epoch_end, l7proto, '', '', '', vlan)
end
-- ########################################################