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 RRD update errors due to invalid min timestamp calculation

Browse source 
SNMP hosts appear into ntopng during 5min script run, so their timestamp corresponds exactly
to the 5min script timestamp. This triggered the issue.

Fixes #2734
This commit is contained in:
emanuele-f 2019-08-02 10:42:01 +02:00
parent 348e7b6c14
commit ebc204b0cc
1 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,9 @@ local ts_utils = require "ts_utils_core"
local format_utils = require "format_utils"
require "ts_5min"
-- Set to true to debug host timeseries points timestamps
local enable_debug = false
local ts_custom
if ntop.exists(dirs.installdir .. "/scripts/lua/modules/timeseries/custom/ts_5min_custom.lua") then
package.path = dirs.installdir .. "/scripts/lua/modules/timeseries/custom/?.lua;" .. package.path
@ -364,6 +367,10 @@ end
function ts_dump.host_update_rrd(when, hostname, host, ifstats, verbose, config)
-- Crunch additional stats for local hosts only
if config.host_rrd_creation ~= "0" then
if enable_debug then
traceError(TRACE_NORMAL, TRACE_CONSOLE, "@".. when .." Going to update host " .. hostname)
end
-- Traffic stats
if(config.host_rrd_creation == "1") then
ts_dump.host_update_stats_rrds(when, hostname, host, ifstats, verbose)
@ -406,15 +413,27 @@ function ts_dump.run_5min_dump(_ifname, ifstats, config, when, time_threshold, s
if(host_ts.initial_point ~= nil) then
-- Dump the first point
if enable_debug then
traceError(TRACE_NORMAL, TRACE_CONSOLE, "Dumping initial point for " .. host_key)
end
ts_dump.host_update_rrd(host_ts.initial_point_time, host_key, host_ts.initial_point, ifstats, verbose, config)
min_host_instant = math.max(min_host_instant, host_ts.initial_point_time - 1)
min_host_instant = math.max(min_host_instant, host_ts.initial_point_time + 1)
end
for _, host_point in ipairs(host_ts or {}) do
host_ts = host_ts or {}
if enable_debug then
traceError(TRACE_NORMAL, TRACE_CONSOLE, "Dumping ".. (#host_ts) .." points for " .. host_key)
end
for _, host_point in ipairs(host_ts) do
local instant = host_point.instant
if instant >= min_host_instant then
ts_dump.host_update_rrd(instant, host_key, host_point, ifstats, verbose, config)
elseif enable_debug then
traceError(TRACE_NORMAL, TRACE_CONSOLE, "Skipping point: instant=" .. instant .. " but min_host_instant=" .. min_host_instant)
end
end