vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-30 07:59:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use schema name in timeseries API

Browse source
This commit is contained in:
emanuele-f 2018-06-27 17:18:23 +02:00
parent 39a7375727
commit 5d50622341
9 changed files with 86 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

42
scripts/lua/modules/timeseries/ts_utils.lua
View file

@ -40,6 +40,12 @@ end
function ts_utils.newSchema(name, options)
local schema = ts_utils.schema:new(name, options)
if loaded_schemas[name] ~= nil then
traceError(TRACE_WARNING, TRACE_CONSOLE, "Schema already defined: " .. name)
return loaded_schemas[name]
end
loaded_schemas[name] = schema
return schema
@ -84,8 +90,15 @@ end
-----------------------------------------------------------------------
function ts_utils.append(schema, tags_and_metrics, timestamp, verbose)
function ts_utils.append(schema_name, tags_and_metrics, timestamp, verbose)
timestamp = timestamp or os.time()
local schema = ts_utils.getSchema(schema_name)
if not schema then
traceError(TRACE_ERROR, TRACE_CONSOLE, "Schema not found: " .. schema_name)
return false
end
local tags, data = schema:verifyTagsAndMetrics(tags_and_metrics)
if not tags then
@ -155,13 +168,20 @@ end
-----------------------------------------------------------------------
function ts_utils.query(schema, tags, tstart, tend, options)
function ts_utils.query(schema_name, tags, tstart, tend, options)
local query_options = table.merge({
fill_value = 0, -- e.g. 0/0 for nan
min_value = 0, -- minimum value of a data point
max_value = math.huge, -- maximum value for a data point
}, options or {})
local schema = ts_utils.getSchema(schema_name)
if not schema then
traceError(TRACE_ERROR, TRACE_CONSOLE, "Schema not found: " .. schema_name)
return false
end
if not schema:verifyTags(tags) then
return nil
end
@ -200,7 +220,14 @@ end
-- List all the data series matching the given filter.
-- Only data series updated after start_time will be returned.
-- Returns a list of expanded tags based on the matches.
function ts_utils.listSeries(schema, tags_filter, start_time)
function ts_utils.listSeries(schema_name, tags_filter, start_time)
local schema = ts_utils.getSchema(schema_name)
if not schema then
traceError(TRACE_ERROR, TRACE_CONSOLE, "Schema not found: " .. schema_name)
return false
end
local driver = ts_utils.getQueryDriver()
if not driver then
@ -232,7 +259,14 @@ end
-----------------------------------------------------------------------
function ts_utils.delete(schema, tags)
function ts_utils.delete(schema_name, tags)
local schema = ts_utils.getSchema(schema_name)
if not schema then
traceError(TRACE_ERROR, TRACE_CONSOLE, "Schema not found: " .. schema_name)
return false
end
if not schema:verifyTags(data) then
return false
end