tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-11577-14344-alertas-con-threshold-siguen-enviando-multiples-correos-de-recuperacion' into 'develop' 

Fix alert action execution when recovered

See merge request artica/pandorafms!6108
This commit is contained in:
Matias Didier 2023-06-15 12:30:31 +00:00
parent 6f89b45ce3 b80e65c249
commit 7d550de82d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_server/lib/PandoraFMS/Core.pm
View File

@ -1025,7 +1025,6 @@ sub pandora_execute_alert {
# Check the action threshold (template_action_threshold takes precedence over action_threshold) # Check the action threshold (template_action_threshold takes precedence over action_threshold)
my $threshold = 0; my $threshold = 0;
my $recovered = 0;
$action->{'last_execution'} = 0 unless defined ($action->{'last_execution'}); $action->{'last_execution'} = 0 unless defined ($action->{'last_execution'});
$action->{'recovered'} = 0 unless defined ($action->{'recovered'}); $action->{'recovered'} = 0 unless defined ($action->{'recovered'});
@ -1047,11 +1046,11 @@ sub pandora_execute_alert {
if($alert_mode == RECOVERED_ALERT) { if($alert_mode == RECOVERED_ALERT) {
# Reset action thresholds and set recovered # Reset action thresholds and set recovered
if (defined ($alert->{'id_template_module'})) { if (defined ($alert->{'id_template_module'})) {
db_do($dbh, 'UPDATE talert_template_module_actions SET recovered = 1 WHERE id_alert_template_module = ?', $alert->{'id_template_module'}); db_do($dbh, 'UPDATE talert_template_module_actions SET recovered = 1 WHERE id = ?', $action->{'id_alert_templ_module_actions'});
} }
} else { } else {
# Action executed again, set recovered to 0. # Action executed again, set recovered to 0.
db_do($dbh, 'UPDATE talert_template_module_actions SET recovered = 0 WHERE id_alert_template_module = ?', $alert->{'id_template_module'}); db_do($dbh, 'UPDATE talert_template_module_actions SET recovered = 0 WHERE id = ?', $action->{'id_alert_templ_module_actions'});
} }
} else { } else {
if($alert_mode == RECOVERED_ALERT) { if($alert_mode == RECOVERED_ALERT) {
@ -1970,7 +1969,7 @@ sub pandora_execute_action ($$$$$$$$$;$$) {
} }
# Update action last execution date # Update action last execution date
if (defined ($action->{'last_execution'}) && defined ($action->{'id_alert_templ_module_actions'})) { if ($alert_mode != RECOVERED_ALERT && defined ($action->{'last_execution'}) && defined ($action->{'id_alert_templ_module_actions'})) {
db_do ($dbh, 'UPDATE talert_template_module_actions SET last_execution = ? db_do ($dbh, 'UPDATE talert_template_module_actions SET last_execution = ?
WHERE id = ?', int(time ()), $action->{'id_alert_templ_module_actions'}); WHERE id = ?', int(time ()), $action->{'id_alert_templ_module_actions'});
} }