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

Improve timeseries comments and fix Prometheus settings

Browse source
This commit is contained in:
emanuele-f 2019-07-02 15:05:00 +02:00
parent 7136ff6fbf
commit c56b01b37e
4 changed files with 21 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,6 @@ end
-- ##############################################
-- TODO remove after migrating to the new path format
-- Maps second tag name to getRRDName
local HOST_PREFIX_MAP = {
host = "",
@ -153,40 +152,6 @@ function driver.schema_get_full_path(schema, tags)
return full_path
end
-- TODO remove after migration
function find_schema(rrdFile, rrdfname, tags, ts_utils)
-- try to guess additional tags
local v = string.split(rrdfname, "%.rrd")
if((v ~= nil) and (#v == 1)) then
local app = v[1]
if interface.getnDPIProtoId(app) ~= -1 then
tags.protocol = app
elseif interface.getnDPICategoryId(app) ~= -1 then
tags.category = app
end
end
for schema_name, schema in pairs(ts_utils.getLoadedSchemas()) do
-- verify tags compatibility
for tag in pairs(schema.tags) do
if tags[tag] == nil then
goto next_schema
end
end
local full_path = driver.schema_get_full_path(schema, tags)
if full_path == rrdFile then
return schema_name
end
::next_schema::
end
return nil
end
-- ##############################################
local function getRRAParameters(step, resolution, retention_time)