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

Fix interface RRD overlap between mining category and application

Browse source 
Interface categories are now placed under the ndpi_categories rrd subfolder. Existing data is migrated.
This commit is contained in:
emanuele-f 2019-05-16 00:13:43 +02:00
parent ace94bd786
commit 3e612869a5
5 changed files with 44 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

21
scripts/lua/modules/timeseries/drivers/rrd.lua
View file

@ -94,19 +94,20 @@ local function schema_get_path(schema, tags)
-- ifid is mandatory here
local ifid = tags.ifid or -1
local host_or_network = nil
local parts = string.split(schema.name, ":")
if (string.find(schema.name, "iface:") ~= 1) and
(string.find(schema.name, "process:") ~= 1) then
local parts = string.split(schema.name, ":")
if((string.find(schema.name, "iface:") ~= 1) and -- interfaces are only identified by the first tag
(#schema._tags >= 2)) then -- some schema do not have 2 tags, e.g. "process:*" schemas
host_or_network = (HOST_PREFIX_MAP[parts[1]] or (parts[1] .. ":")) .. tags[schema._tags[2]]
end
if parts[1] == "snmp_if" then
suffix = tags.if_index .. "/"
elseif (parts[1] == "flowdev_port") or (parts[1] == "sflowdev_port") then
suffix = tags.port .. "/"
elseif parts[2] == "ndpi_categories" then
suffix = "ndpi_categories/"
end
-- Some exceptions to avoid conflicts / keep compatibility
if parts[1] == "snmp_if" then
suffix = tags.if_index .. "/"
elseif (parts[1] == "flowdev_port") or (parts[1] == "sflowdev_port") then
suffix = tags.port .. "/"
elseif parts[2] == "ndpi_categories" then
suffix = "ndpi_categories/"
end
local path = getRRDName(ifid, host_or_network) .. suffix