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

Implements per-MAC RRDs (backend)

Browse source 
MAC bytes rrd is currently created if enabled from the preferences.
This commit is contained in:
Simone Mainardi 2017-10-04 13:07:13 +02:00
parent 3b59672436
commit c54b2523a1
4 changed files with 93 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -174,7 +174,8 @@ end
-- ##############################################
function isMacAddress(address)
if(string.match(address, "^%x%x:%x%x:%x%x:%x%x:%x%x:%x%x$") ~= nil) then
if(string.match(address, "^%x%x:%x%x:%x%x:%x%x:%x%x:%x%x$") ~= nil) or
(string.match(address, "^%x%x:%x%x:%x%x:%x%x:%x%x:%x%x%@%d+$") ~= nil) then
return true
end
return false
@ -2101,11 +2102,36 @@ function getPathFromIPv6(addr)
return res
end
function getPathFromMac(addr)
if not isMacAddress(addr) then return end
local mac = {}
local vlan = addr:match("@%d+$") or ''
for i, p in ipairs(addr:split(":")) do
mac[i] = string.format('%.2x', tonumber(p, 16) or 0)
end
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, "/")
-- the nic identifier goes as-is because it is non structured
res = fixPath(res.."/"..table.concat(nic, "_"))
-- finally the vlan
res = res..vlan
return res
end
function getPathFromKey(key)
if key == nil then key = "" end
if isIPv6(key) then
return getPathFromIPv6(key)
elseif isMacAddress(key) then
return getPathFromMac(key)
end
key = tostring(key):gsub("[%.:]", "/")