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

Escapes possible spaces and special charaters from profile names to create RRDS

Browse source
This commit is contained in:
Simone Mainardi 2015-11-09 20:14:34 +01:00
parent c839e85d6e
commit 83574e1a9d
3 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -159,11 +159,16 @@ function percentageBar(total, value, valueLabel)
end
-- ########################################################
-- host_or_network: host or network name. If network, must be prefixed with 'net:'
-- host_or_network: host or network name.
-- If network, must be prefixed with 'net:'
-- If profile, must be prefixed with 'profile:'
function getRRDName(ifid, host_or_network, rrdFile)
if host_or_network ~= nil and string.starts(host_or_network, 'net:') then
host_or_network = string.gsub(host_or_network, 'net:', '')
rrdname = fixPath(dirs.workingdir .. "/" .. ifid .. "/subnetstats/")
elseif host_or_network ~= nil and string.starts(host_or_network, 'profile:') then
host_or_network = string.gsub(host_or_network, 'profile:', '')
rrdname = fixPath(dirs.workingdir .. "/" .. ifid .. "/profilestats/")
else
rrdname = fixPath(dirs.workingdir .. "/" .. ifid .. "/rrd/")
end
@ -452,7 +457,11 @@ for k,v in ipairs(zoom_vals) do
-- display 1 minute button only for networks and interface stats
-- but exclude applications. Application statistics are gathered
-- every 5 minutes
if zoom_vals[k][1] == '1m' and ((host and not string.starts(host, 'net:')) or not top_rrds[rrdFile]) then
local net_or_profile = false
if host and (string.starts(host, 'net:') or string.starts(host, 'profile:')) then
net_or_profile = true
end
if zoom_vals[k][1] == '1m' and (not net_or_profile and not top_rrds[rrdFile]) then
goto continue
end
print('<label class="btn btn-link ')