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

Fixes invalid use of alert engine

Browse source
This commit is contained in:
Simone Mainardi 2017-04-26 16:09:55 +02:00
parent 1545dcb73e
commit 57b592c905
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -191,14 +191,14 @@ function delete_alert_configuration(alert_source, ifname)
end
-- check if we are processing a pair ip-vlan such as 192.168.1.0@0
if string.match(alert_source, "@") then
interface.releaseHostAlert(alert_source, timespan.."_"..metric, alert_type, alert_level, "Alarm released.")
interface.releaseHostAlert(alertEngine(timespan), alert_source, timespan.."_"..metric, alert_type, alert_level, "Alarm released.")
is_host = true
-- check if this is a subnet
elseif string.match(alert_source, "/") then
interface.releaseNetworkAlert(alert_source, timespan.."_"..metric, alert_type, alert_level, "Alarm released.")
interface.releaseNetworkAlert(alertEngine(timespan), alert_source, timespan.."_"..metric, alert_type, alert_level, "Alarm released.")
-- finally assume it's an interface alert
else
interface.releaseInterfaceAlert(timespan.."_"..metric, alert_type, alert_level, "Alarm released.")
interface.releaseInterfaceAlert(alertEngine(timespan), timespan.."_"..metric, alert_type, alert_level, "Alarm released.")
end
end
ntop.delHashCache(key, alert_source)
@ -208,6 +208,7 @@ function delete_alert_configuration(alert_source, ifname)
if is_host == true then
interface.refreshNumAlerts(alert_source)
end
invalidateEngagedAlertsCache()
interface.refreshNumAlerts()
end
@ -249,12 +250,12 @@ function refresh_alert_configuration(alert_source, ifname, timespan, alerts_stri
for k2, metric in pairs(alarmable_metrics) do
if new_alert_ids[timespan.."_"..metric] ~= true then
if string.match(alert_source, "@") then
interface.releaseHostAlert(timespan --[[engine]], alert_source, timespan.."_"..metric, alert_type, alert_level, "released.")
interface.releaseHostAlert(alertEngine(timespan), alert_source, timespan.."_"..metric, alert_type, alert_level, "released.")
is_host = true
elseif string.match(alert_source, "/") then
interface.releaseNetworkAlert(timespan --[[engine]], alert_source, timespan.."_"..metric, alert_type, alert_level, "released.")
interface.releaseNetworkAlert(alertEngine(timespan), alert_source, timespan.."_"..metric, alert_type, alert_level, "released.")
else
interface.releaseInterfaceAlert(timespan --[[engine]], timespan.."_"..metric, alert_type, alert_level, "Alarm released.")
interface.releaseInterfaceAlert(alertEngine(timespan), timespan.."_"..metric, alert_type, alert_level, "Alarm released.")
end
end
end
@ -263,6 +264,7 @@ function refresh_alert_configuration(alert_source, ifname, timespan, alerts_stri
if is_host == true then
interface.refreshNumAlerts(alert_source)
end
invalidateEngagedAlertsCache()
interface.refreshNumAlerts()
end