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

Fixes javascript error on missing RRDs

Browse source 
Missing RRDs when displaying applications per interface (e.g., http://localhost:3000/lua/if_stats.lua?if_name=en0&page=historical&rrd_file=all&graph_zoom=1m)
were preventing the page from being rendered.
This commit is contained in:
Simone Mainardi 2015-11-08 22:48:23 +01:00
parent 3b0d35a822
commit 7930930360
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,7 +92,7 @@ function navigatedir(url, label, base, path, go_deep, print_html, ifid, host, st
if(do_debug) then print(v.."<br>\n") end
end
end
else
else
rrd = singlerrd2json(ifid, host, v, start_time, end_time, true)
if((rrd.totalval ~= nil) and (rrd.totalval > 0)) then
@ -1357,7 +1357,7 @@ function singlerrd2json(ifid, host, rrdFile, start_time, end_time, rickshaw_json
if(elemId > 1) then
json_ret = json_ret.."\n,\n"
end
name = names[elemId]
local name = names[elemId]
json_ret = json_ret..'{"name": "'.. name .. '",\n'
json_ret = json_ret..'color: \''.. colors[elemId] ..'\',\n'
json_ret = json_ret..'"data": [\n'
@ -1439,8 +1439,6 @@ function singlerrd2json(ifid, host, rrdFile, start_time, end_time, rickshaw_json
json_ret = json_ret..'\n] }\n'
end
end
else
json_ret = '{}'
end
local ret = {}
@ -1542,7 +1540,7 @@ function rrd2json(ifid, host, rrdFile, start_time, end_time, rickshaw_json, expa
if(debug_metric) then io.write("#rrds="..num.."\n") end
if(num == 0) then
ret = {}
ret.json = ""
ret.json = "[]"
return(ret)
end
local i = 1