vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-01 00:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add experimental support for 5sec granularity for host timeseries

Browse source 
To enable it (only on *InfluxDB* right now):

- uncomment HOST_NUM_TIMESERIES_POINTS in ntop_defines.h
- run `redis-cli set ntopng.prefs.30_sec_dump 1` and restart ntopng
This commit is contained in:
emanuele-f 2018-08-23 18:02:19 +02:00
parent 413c265ecb
commit 0004e08191
24 changed files with 354 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

30
scripts/lua/modules/timeseries/drivers/influxdb.lua
View file

@ -382,11 +382,6 @@ end
-- ##############################################
function driver:export()
local system_iface_id = -1
local time_key = "ntopng.cache.influxdb_export_time_" .. self.db
local prev_t = tonumber(ntop.getCache(time_key)) or 0
local max_t = prev_t
while(true) do
local name_id = ntop.lpopCache("ntopng.influx_file_queue")
local ret
@ -395,17 +390,24 @@ function driver:export()
break
end
local time_ref = tonumber(name_id)
local parts = split(name_id, "|")
local ifid = tonumber(parts[1])
local time_ref = tonumber(parts[2])
local export_id = tonumber(parts[3])
if(time_ref == nil) then
if((ifid == nil) or (time_ref == nil) or (export_id == nil)) then
traceError(TRACE_ERROR, TRACE_CONSOLE, "Invalid name "..name_id.."\n")
break
end
local fname = os_utils.fixPath(dirs.workingdir .. "/" .. system_iface_id .. "/ts_export/" .. name_id)
local time_key = "ntopng.cache.influxdb_export_time_" .. self.db .. "_" .. ifid
local prev_t = tonumber(ntop.getCache(time_key)) or 0
local fname = os_utils.fixPath(dirs.workingdir .. "/" .. ifid .. "/ts_export/" .. export_id .. "_" .. time_ref)
-- Delete the file after POST
local delete_file_after_post = true
local t = os.time()
ret = ntop.postHTTPTextFile(self.username, self.password, self.url .. "/write?db=" .. self.db, fname, delete_file_after_post, 5 --[[ timeout ]])
if(ret ~= true) then
@ -414,20 +416,18 @@ function driver:export()
-- delete the file manually
os.remove(fname)
break
else
max_t = math.max(time_ref, max_t)
end
end
if max_t > prev_t then
ntop.setCache(time_key, tostring(max_t))
-- Successfully exported
--tprint("Exported ".. fname .." in " .. (os.time() - t) .. " sec")
ntop.setCache(time_key, tostring(math.max(prev_t, time_ref)))
end
end
-- ##############################################
function driver:getLatestTimestamp()
local k = "ntopng.cache.influxdb_export_time_" .. self.db
function driver:getLatestTimestamp(ifid)
local k = "ntopng.cache.influxdb_export_time_" .. self.db .. "_" .. ifid
local v = tonumber(ntop.getCache(k))
if v ~= nil then