Reworked nSeries support

Added patch for avoiding #1545
This commit is contained in:
Luca 2017-11-09 23:55:52 +00:00
parent 77a053551d
commit 044fe19677
11 changed files with 245 additions and 120 deletions

View file

@ -970,7 +970,7 @@ function create_rrd_num(name, ds, step)
end
end
function makeRRD(basedir, when, ifname, key, rrdname, step, value)
function makeRRD(basedir, when, if_id, key, rrdname, step, value)
local name = fixPath(basedir .. "/" .. rrdname .. ".rrd")
if(string.contains(rrdname, "num_")) then
@ -981,12 +981,12 @@ function makeRRD(basedir, when, ifname, key, rrdname, step, value)
ntop.rrd_update(name, nil, tolongint(value))
local tskey = ifname
local tskey = if_id
if(key ~= nil) then tskey = tskey ..":"..key end
ntop.tsSet(when, ifname, tonumber(step), "iface", nil, rrdname, tonumber(value), 0)
ntop.tsSet(when, if_id, tonumber(step), "iface", nil, rrdname, tonumber(value), 0)
if(enable_second_debug) then
io.write('Updating RRD ['.. ifname..'] '.. name .. " " .. value ..'\n')
io.write('Updating RRD ['.. if_id..'] '.. name .. " " .. value ..'\n')
end
end