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

Generalize high resolution timeseries

Browse source 
In InfluxDB, 5 minutes timeseries are now written with a minimum of 1 minute resolution
This commit is contained in:
emanuele-f 2018-09-03 10:10:03 +02:00
parent bd99c73cc5
commit a594e648c4
21 changed files with 482 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

25
scripts/lua/modules/callback_utils.lua
View file

@ -106,28 +106,15 @@ end
-- ########################################################
function callback_utils.is30SecDumpEnabled()
return ntop.getPref("ntopng.prefs.30_sec_dump") == "1"
end
-- ########################################################
-- Iterates each active host on the ifname interface for RRD creation.
-- Each host is passed to the callback with some more information.
function callback_utils.foreachLocalRRDHost(ifname, deadline, callback)
function callback_utils.foreachLocalRRDHost(ifname, deadline, with_ts, callback)
interface.select(ifname)
local iterator = callback_utils.getLocalHostsIterator(false --[[ no details ]])
local dump30sec = callback_utils.is30SecDumpEnabled()
for hostname, hoststats in iterator do
local host
if dump30sec then
host = interface.getHostTimeseries(hostname) or {}
else
host = interface.getHostInfo(hostname)
end
local host_ts = nil
if(ntop.isShutdown()) then return true end
if ((deadline ~= nil) and (os.time() >= deadline)) then
@ -135,11 +122,13 @@ function callback_utils.foreachLocalRRDHost(ifname, deadline, callback)
return false
end
if host ~= nil then
if callback(hostname, host--[[hostinfo]]) == false then
if with_ts then
host_ts = interface.getHostTimeseries(hostname) or {}
end
if callback(hostname, host_ts) == false then
return false
end
end
end
return true