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

Fix engaged alerts reported in all tab

Browse source
This commit is contained in:
Alfredo Cardigliano 2023-02-02 11:00:47 +01:00
parent 41c7d16650
commit cbc7eadbd8
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/lua/modules/alert_store/alert_store.lua
View file

@ -1020,12 +1020,12 @@ function alert_store:select_engaged(filter)
-- Sort and filtering
for idx, alert in pairs(alerts) do
-- Exclude alerts falling outside requested time ranges
local tstamp = tonumber(alert.tstamp)
-- Engaged alerts are currently active, ignore begin epoch
-- if self._epoch_begin and tstamp < self._epoch_begin then goto continue end
-- Exclude alerts falling outside requested time ranges
if self._epoch_end and tstamp > self._epoch_end then goto continue end
if self._subtype and alert.subtype ~= self._subtype then goto continue end

11
scripts/lua/modules/alert_store/all_alert_store.lua
View file

@ -62,9 +62,12 @@ end
function all_alert_store:__add_alert_stats(alert, alerts_by_entity, alerts_by_entity_flat)
local entity_id = alert.entity_id
-- Exclude alerts falling outside requested time ranges
local tstamp = tonumber(alert.tstamp)
if self._epoch_begin and tstamp < self._epoch_begin then return end
-- Engaged alerts are currently active, ignore begin epoch
--if self._epoch_begin and tstamp < self._epoch_begin then return end
-- Exclude alerts falling outside requested time ranges
if self._epoch_end and tstamp > self._epoch_end then return end
if not alerts_by_entity[entity_id] then
@ -111,7 +114,6 @@ end
--@return Selected engaged alerts, and the total number of engaged alerts
function all_alert_store:select_engaged(filter)
-- No filter, get all active interface alerts
local alerts
local alerts_by_entity_flat = {}
local alerts_by_entity = {}
@ -119,7 +121,8 @@ function all_alert_store:select_engaged(filter)
local sort_2_col = {}
-- Compute alert stats for this interface
alerts = interface.getEngagedAlerts()
local alerts = interface.getEngagedAlerts()
for _, alert in pairs(alerts) do
self:__add_alert_stats(alert, alerts_by_entity, alerts_by_entity_flat)
end