vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-01 16:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Implements per-MAC RRDs (backend)

Browse source
This commit is contained in:
Simone Mainardi 2017-10-04 16:30:38 +02:00
parent c54b2523a1
commit e6da58e567
3 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1113,7 +1113,7 @@ function singlerrd2json(ifid, host, rrdFile, start_time, end_time, rickshaw_json
-- do not scale number, packets, and drops
scaling_factor = 1
end
if(not ntop.notEmptyFile(rrdname)) then return '{}' end
local fstart, fstep, fnames, fdata = ntop.rrd_fetch(rrdname, 'AVERAGE', start_time, end_time)

6
scripts/lua/modules/lua_utils.lua
View file

@ -2115,10 +2115,10 @@ function getPathFromMac(addr)
local manufacturer = {mac[1], mac[2], mac[3]}
local nic = {mac[4], mac[5], mac[6]}
-- manufacturers go in a hierarchical structure
local res = table.concat(manufacturer, "/")
-- each manufacturer has its own directory
local res = table.concat(manufacturer, "_")
-- the nic identifier goes as-is because it is non structured
res = fixPath(res.."/"..table.concat(nic, "_"))
res = fixPath(res.."/"..table.concat(nic, "/"))
-- finally the vlan
res = res..vlan