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

Implements stacked apps/categories charts for ASes, Networks, etc

Browse source 
Implements #1505
This commit is contained in:
Simone Mainardi 2017-10-05 17:50:01 +02:00
parent d232ad2085
commit 2faec95bd6
2 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -230,7 +230,7 @@ function getRRDName(ifid, host_or_network, rrdFile)
rrdname = rrdname .. getPathFromKey(host_or_network) .. "/"
end
return(rrdname..(rrdFile or ''))
return fixPath(rrdname..(rrdFile or ''))
end
-- ########################################################
@ -1486,22 +1486,16 @@ function rrd2json(ifid, host, rrdFile, start_time, end_time, rickshaw_json, expa
-- disable expand interface views for rrdFile == all
local expand_interface_views = false
local dirs = ntop.getDirs()
local p = dirs.workingdir .. "/" .. ifid .. "/rrd/"
local d = getRRDName(ifid, host)
if(debug_metric) then io.write("Navigating: "..p.."\n") end
if(host ~= nil) then
p = p .. getPathFromKey(host)
go_deep = true
else
go_deep = false
end
local go_deep = true
local ndpi_protocols = interface.getnDPIProtocols()
local ndpi_categories = interface.getnDPICategories()
local filter = ndpi_protocols
if rrdFile == "all_ndpi_categories" then filter = ndpi_categories end
local d = fixPath(p)
local rrds = navigatedir("", "*", d, d, go_deep, false, ifid, host, start_time, end_time, filter)
local traffic_array = {}