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

Implement experimental timeseries query API

Browse source
This commit is contained in:
emanuele-f 2018-06-26 11:59:39 +02:00
parent 5f461dfbd3
commit 84c32d499b
11 changed files with 442 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -861,6 +861,27 @@ end
-- ########################################################
-- TODO: remove after migration
local function data_to_old_format(data)
local fdata = {}
for idx, _ in ipairs(data.series[1].data) do
fdata[idx] = {}
for i, serie in ipairs(data.series) do
fdata[idx][i] = serie.data[idx]
end
end
local fnames = {}
for i, serie in ipairs(data.series) do
fnames[i] = serie.label
end
return data.start, data.step, fnames, fdata
end
-- ########################################################
-- reads one or more RRDs and returns a json suitable to feed rickshaw
function singlerrd2json(ifid, host, rrdFile, start_time, end_time, rickshaw_json, append_ifname_to_labels, transform_columns_function)
@ -888,8 +909,41 @@ function singlerrd2json(ifid, host, rrdFile, start_time, end_time, rickshaw_json
if(not ntop.notEmptyFile(rrdname)) then return '{}' end
local fstart, fstep, fnames, fdata = ntop.rrd_fetch(rrdname, 'AVERAGE', start_time, end_time)
if(fstart == nil) then return '{}' end
local fstart, fstep, fnames, fdata
-- Uncomment HERE to enable the new API
--local use_new_api = true
if use_new_api then
local ts_utils = require("ts_utils")
require("ts_second")
require("ts_minute")
require("ts_5min")
local tags = {ifid=ifid, host=host}
local schema = find_schema(rrdname, rrdFile, tags, ts_utils)
if schema then
fdata = ts_utils.query(schema, tags, start_time, end_time)
if(fdata == nil) then
-- failed, fall back to default api
use_new_api = false
traceError(TRACE_NORMAL, TRACE_CONSOLE, "fetch failed, falling back to old api for RRD " .. rrdname)
else
fstart, fstep, fnames, fdata = data_to_old_format(fdata)
end
else
-- failed, fall back to default api
use_new_api = false
traceError(TRACE_NORMAL, TRACE_CONSOLE, "falling back to old api for RRD " .. rrdname)
end
end
if not use_new_api then
fstart, fstep, fnames, fdata = ntop.rrd_fetch(rrdname, 'AVERAGE', start_time, end_time)
if(fstart == nil) then return '{}' end
end
if transform_columns_function ~= nil then
--~ tprint(rrdname)