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

Various flow dump improvements and bug fixes

Browse source
This commit is contained in:
Luca Deri 2015-08-17 10:57:17 +02:00
parent 4945f5c902
commit 2a5baca948
15 changed files with 148 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -248,6 +248,8 @@ function drawRRD(ifid, host, rrdFile, zoomLevel, baseurl, show_timeseries,
selectedEpoch, selected_epoch_sanitized, topArray)
local debug_rrd = false
if(zoomLevel == nil) then zoomLevel = "1h" end
if(ntop.isPro()) then
drawProGraph(ifid, host, rrdFile, zoomLevel, baseurl, show_timeseries, selectedEpoch, selected_epoch_sanitized, topArray)
return
@ -544,8 +546,7 @@ end -- topArray ~= nil
print[[</div></td></tr>]]
printGraphTopFlows(ifid, (host or ''), _GET["epoch"], _GET["graph_zoom"], rrdFile)
printGraphTopFlows(ifid, (host or ''), _GET["epoch"], zoomLevel, rrdFile)
print [[
@ -987,7 +988,7 @@ function printGraphTopFlows(ifId, host, epoch, zoomLevel, l7proto)
if(rsp == nil) then return end
if((epoch == nil) or (epoch == "")) then epoch = os.time() end
local d = getZoomDuration(zoomLevel)/2
epoch_end = epoch+d
@ -1120,9 +1121,9 @@ print [[
}
},
{
title: "Packets",
field: "PACKETS",
sortable: true,
title: "Avg Thpt",
field: "AVG_THROUGHPUT",
sortable: false,
css: {
textAlign: 'right'
}
@ -1217,9 +1218,9 @@ print [[
}
},
{
title: "Packets",
field: "PACKETS",
sortable: true,
title: "Avg Thpt",
field: "AVG_THROUGHPUT",
sortable: false,
css: {
textAlign: 'right'
}