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

Refactors logic to engage alerts to simplify it

Browse source
This commit is contained in:
Simone Mainardi 2019-06-11 16:03:54 +02:00
parent cc22879c85
commit a543ec8e73
1 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

32
scripts/lua/modules/alert_utils.lua
View file

@ -2282,10 +2282,19 @@ local function engageReleaseAlert(engaged, ifid, engine, entity_type, entity_val
end
end
local function engageAlert(ifid, engine, entity_type, entity_value, atype, akey, entity_info, alert_info, force)
local function engageAlert(ifid, working_status, entity_type, entity_value, atype, akey, entity_info, alert_info, force)
local engine = working_status.engine
local engaged_cache = working_status.engaged_cache
if(verbose) then io.write("Engage Alert: "..entity_value.." "..atype.." "..akey.."\n") end
engageReleaseAlert(true, ifid, engine, entity_type, entity_value, atype, akey, entity_info, alert_info, force)
if ((engaged_cache[entity_type] == nil)
or (engaged_cache[entity_type][entity_value] == nil)
or (engaged_cache[entity_type][entity_value][atype] == nil)
or (engaged_cache[entity_type][entity_value][atype][akey] == nil)) then
engageReleaseAlert(true, ifid, engine, entity_type, entity_value, atype, akey, entity_info, alert_info, force)
working_status.dirty_cache = true
end
end
local function releaseAlert(ifid, engine, entity_type, entity_value, atype, akey, entity_info, alert_info, force)
@ -2420,13 +2429,7 @@ local function check_entity_alerts(ifid, entity_type, entity_value, working_stat
-- Engage logic
for atype, akeys in pairs(current_alerts) do
for akey, alert_info in pairs(akeys) do
if ((engaged_cache[entity_type] == nil)
or (engaged_cache[entity_type][entity_value] == nil)
or (engaged_cache[entity_type][entity_value][atype] == nil)
or (engaged_cache[entity_type][entity_value][atype][akey] == nil)) then
engageAlert(ifid, engine, entity_type, entity_value, atype, akey, entity_info, alert_info)
working_status.dirty_cache = true
end
engageAlert(ifid, working_status, entity_type, entity_value, atype, akey, entity_info, alert_info)
end
end
@ -2642,14 +2645,9 @@ local function check_inactive_hosts_alerts(ifid, working_status)
releaseAlert(ifid, engine, entity_type, entity_value, atype, akey)
working_status.dirty_cache = true
end
elseif not host_info and
(not engaged_cache[entity_type]
or not engaged_cache[entity_type][entity_value]
or not engaged_cache[entity_type][entity_value][atype]
or not engaged_cache[entity_type][entity_value][atype][akey]) then
-- ENGAGE
engageAlert(ifid, engine, entity_type, entity_value, atype, akey)
working_status.dirty_cache = true
elseif not host_info then
-- ENGAGE
engageAlert(ifid, working_status, entity_type, entity_value, atype, akey)
end
end
end