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

Fix periodic scripts being called every minute with hasHighResolutionTs

Browse source
This commit is contained in:
emanuele-f 2019-10-15 11:18:00 +02:00
parent 8d5fe7451d
commit 90cadaf560
3 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scripts/lua/modules/ts_5min_dump_utils.lua
View file

@ -396,20 +396,24 @@ end
-- ########################################################
function ts_dump.run_5min_dump(_ifname, ifstats, config, when, time_threshold, skip_ts, skip_alerts, verbose)
local working_status = nil
local is_rrd_creation_enabled = (not skip_ts) and (ntop.getPref("ntopng.prefs.ifid_"..ifstats.id..".interface_rrd_creation") ~= "false")
local are_alerts_enabled = (not skip_alerts) and mustScanAlerts(ifstats)
-- This performs all the 5 minutes tasks execept the timeseries dump
function ts_dump.run_5min_tasks(_ifname, ifstats)
user_scripts.runPeriodicScripts("5mins")
housekeepingAlertsMakeRoom(ifstats.id)
end
-- ########################################################
-- NOTE: this is executed every minute if ts_utils.hasHighResolutionTs() is true
function ts_dump.run_5min_dump(_ifname, ifstats, config, when, time_threshold, verbose)
local is_rrd_creation_enabled = (ntop.getPref("ntopng.prefs.ifid_"..ifstats.id..".interface_rrd_creation") ~= "false")
local num_processed_hosts = 0
local min_instant = when - (when % 60) - 60
user_scripts.runPeriodicScripts("5mins")
local dump_tstart = os.time()
local dumped_hosts = {}
housekeepingAlertsMakeRoom(ifstats.id)
-- Save hosts stats (if enabled from the preferences)
if (is_rrd_creation_enabled and (config.host_rrd_creation ~= "0")) then
local in_time = callback_utils.foreachLocalRRDHost(_ifname, time_threshold, is_rrd_creation_enabled, function (hostname, host_ts)