vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-05-05 10:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add ability to report resolved IP address for unreachable hosts

Browse source
This commit is contained in:
emanuele-f 2020-04-27 15:46:03 +02:00
parent 7d98cc9dbe
commit 00c5e9f909
7 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,7 @@ local script = {
local function run_am_check(params, all_hosts, granularity)
local hosts_am = {}
local resolved_unreachable_hosts = {}
local when = params.when
local am_schema = am_utils.getAmSchemaForGranularity(granularity)
@ -61,7 +62,14 @@ local function run_am_check(params, all_hosts, granularity)
for _, info in pairs(hosts_by_plugin) do
for k, v in pairs(info.measurement.collect_results(granularity) or {}) do
v.measurement = info.measurement
hosts_am[k] = v
if(v.value ~= nil) then
hosts_am[k] = v
elseif(v.resolved_addr ~= nil) then
-- For unreachable hosts, still save the resolved address in order to
-- properly report it into the alert message.
resolved_unreachable_hosts[k] = v.resolved_addr
end
end
end
@ -104,7 +112,9 @@ local function run_am_check(params, all_hosts, granularity)
if(hosts_am[key] == nil) then
if(do_trace) then print("[TRIGGER] Host "..ip.."/"..key.." is unreacheable\n") end
am_utils.triggerAlert(ip, key, 0, 0, granularity)
local resolved_host = resolved_unreachable_hosts[key] or ip
am_utils.triggerAlert(resolved_host, key, 0, 0, granularity)
am_utils.incNumUnreachableChecks(key, when)
if params.ts_enabled then