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

Fix nedge errors in graph_utils

Browse source
This commit is contained in:
emanuele-f 2018-07-20 14:38:33 +02:00
parent 4cafac6a81
commit a4da1294e6
2 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,10 +12,6 @@ local have_nedge = ntop.isnEdge()
local ts_utils = require("ts_utils")
if ntop.isnEdge() then
iface_series[#iface_series + 1] = {schema="iface:nfq_pct", label=i18n("graphs.num_nfq_pct")}
end
-- ########################################################
if(ntop.isPro()) then
@ -268,7 +264,7 @@ function printSeries(options, tags, start_time, base_url, params)
local needs_separator = false
for _,top in ipairs(series) do
if have_nedge and top.nedge_exclude then
if (have_nedge and top.nedge_exclude) or (not have_nedge and top.nedge_only) then
goto continue
end
@ -278,18 +274,18 @@ function printSeries(options, tags, start_time, base_url, params)
local k = top.schema
local v = top.label
-- only show if there has been an update within the specified time frame
local res = ts_utils.listSeries(k, tags, start_time)
-- only show if there has been an update within the specified time frame
local res = ts_utils.listSeries(k, tags, start_time)
if not table.empty(res) then
if needs_separator then
if not table.empty(res) then
if needs_separator then
-- Only add the separator if there are actually some entries in the group
graphMenuDivider()
needs_separator = false
end
populateGraphMenuEntry(v, base_url, table.merge(params, {ts_schema=k}))
end
populateGraphMenuEntry(v, base_url, table.merge(params, {ts_schema=k}))
end
end
::continue::