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

Fixes icmp/icmpv6 http/https and cicmp/cicmp6 active monitoring

Browse source 
Fixes #3887
This commit is contained in:
Simone Mainardi 2020-05-06 20:10:19 +02:00
parent 5294179bf9
commit 2435305166
9 changed files with 179 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/plugins/active_monitoring/user_scripts/system/active_monitoring.lua
View file

@ -57,7 +57,8 @@ local function run_am_check(params, all_hosts, granularity)
-- Get the results
for _, info in pairs(hosts_by_measurement) do
for k, v in pairs(info.measurement.collect_results(granularity) or {}) do
local collected = info.measurement.collect_results(granularity)
for k, v in pairs(collected or {}) do
v.measurement = info.measurement
if(v.value ~= nil) then
@ -90,7 +91,8 @@ local function run_am_check(params, all_hosts, granularity)
value = value * info.measurement.chart_scaling_value
end
ts_utils.append(am_schema, {ifid = getSystemInterfaceId(), host = host.host, metric = host.measurement, value = value}, when)
local ts_data = {ifid = getSystemInterfaceId(), host = host.host, metric = host.measurement, value = value}
ts_utils.append(am_schema, ts_data, when)
end
am_utils.setLastAmUpdate(key, when, host_value, resolved_host, jitter, mean)