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

Execute all previously run actions when an alert recovers.

This commit is contained in:
Ramon Novoa 2015-04-30 13:36:58 +02:00
parent e126b3021c
commit 27420a0868
2 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -624,15 +624,26 @@ sub pandora_execute_alert ($$$$$$$$;$) {
# Simple alert # Simple alert
if (defined ($alert->{'id_template_module'})) { if (defined ($alert->{'id_template_module'})) {
@actions = get_db_rows ($dbh, 'SELECT *, talert_template_module_actions.id AS id_alert_template_module_actions if ($alert_mode == RECOVERED_ALERT) {
FROM talert_template_module_actions, talert_actions, talert_commands @actions = get_db_rows ($dbh, 'SELECT *, talert_template_module_actions.id AS id_alert_template_module_actions
WHERE talert_template_module_actions.id_alert_action = talert_actions.id FROM talert_template_module_actions, talert_actions, talert_commands
AND talert_actions.id_alert_command = talert_commands.id WHERE talert_template_module_actions.id_alert_action = talert_actions.id
AND talert_template_module_actions.id_alert_template_module = ? AND talert_actions.id_alert_command = talert_commands.id
AND ((fires_min = 0 AND fires_max = 0) AND talert_template_module_actions.id_alert_template_module = ?
OR (fires_min <= fires_max AND ? >= fires_min AND ? <= fires_max) AND ((fires_min = 0 AND fires_max = 0)
OR (fires_min > fires_max AND ? >= fires_min))', OR ? >= fires_min)',
$alert->{'id_template_module'}, $alert->{'times_fired'}, $alert->{'times_fired'}, $alert->{'times_fired'}); $alert->{'id_template_module'}, $alert->{'times_fired'});
} else {
@actions = get_db_rows ($dbh, 'SELECT *, talert_template_module_actions.id AS id_alert_template_module_actions
FROM talert_template_module_actions, talert_actions, talert_commands
WHERE talert_template_module_actions.id_alert_action = talert_actions.id
AND talert_actions.id_alert_command = talert_commands.id
AND talert_template_module_actions.id_alert_template_module = ?
AND ((fires_min = 0 AND fires_max = 0)
OR (fires_min <= fires_max AND ? >= fires_min AND ? <= fires_max)
OR (fires_min > fires_max AND ? >= fires_min))',
$alert->{'id_template_module'}, $alert->{'times_fired'}, $alert->{'times_fired'}, $alert->{'times_fired'});
}
# Get default action # Get default action
if ($#actions < 0) { if ($#actions < 0) {
@ -644,15 +655,25 @@ sub pandora_execute_alert ($$$$$$$$;$) {
} }
# Event alert # Event alert
else { else {
@actions = get_db_rows ($dbh, 'SELECT * FROM tevent_alert_action, talert_actions, talert_commands if ($alert_mode == RECOVERED_ALERT) {
WHERE tevent_alert_action.id_alert_action = talert_actions.id @actions = get_db_rows ($dbh, 'SELECT * FROM tevent_alert_action, talert_actions, talert_commands
AND talert_actions.id_alert_command = talert_commands.id WHERE tevent_alert_action.id_alert_action = talert_actions.id
AND tevent_alert_action.id_event_alert = ? AND talert_actions.id_alert_command = talert_commands.id
AND ((fires_min = 0 AND fires_max = 0) AND tevent_alert_action.id_event_alert = ?
OR (fires_min <= fires_max AND ? >= fires_min AND ? <= fires_max) AND ((fires_min = 0 AND fires_max = 0)
OR (fires_min > fires_max AND ? >= fires_min))', OR ? >= fires_min)',
$alert->{'id'}, $alert->{'times_fired'}, $alert->{'times_fired'}, $alert->{'times_fired'}); $alert->{'id'}, $alert->{'times_fired'});
} else {
@actions = get_db_rows ($dbh, 'SELECT * FROM tevent_alert_action, talert_actions, talert_commands
WHERE tevent_alert_action.id_alert_action = talert_actions.id
AND talert_actions.id_alert_command = talert_commands.id
AND tevent_alert_action.id_event_alert = ?
AND ((fires_min = 0 AND fires_max = 0)
OR (fires_min <= fires_max AND ? >= fires_min AND ? <= fires_max)
OR (fires_min > fires_max AND ? >= fires_min))',
$alert->{'id'}, $alert->{'times_fired'}, $alert->{'times_fired'}, $alert->{'times_fired'});
}
# Get default action # Get default action
if ($#actions < 0) { if ($#actions < 0) {
@actions = get_db_rows ($dbh, 'SELECT * FROM talert_actions, talert_commands @actions = get_db_rows ($dbh, 'SELECT * FROM talert_actions, talert_commands
@ -710,7 +731,7 @@ sub pandora_execute_alert ($$$$$$$$;$) {
if ($event_generated == 0) { if ($event_generated == 0) {
#If we've spotted an alert recovered, we set the new event's severity to 2 (NORMAL), otherwise the original value is maintained. #If we've spotted an alert recovered, we set the new event's severity to 2 (NORMAL), otherwise the original value is maintained.
my ($text, $event, $severity) = ($alert_mode == 0) ? ('recovered', 'alert_recovered', 2) : ('fired', 'alert_fired', $alert->{'priority'}); my ($text, $event, $severity) = ($alert_mode == RECOVERED_ALERT) ? ('recovered', 'alert_recovered', 2) : ('fired', 'alert_fired', $alert->{'priority'});
pandora_event ($pa_config, "Alert $text (" . safe_output($alert->{'name'}) . ") " . (defined ($module) ? 'assigned to ('. safe_output($module->{'nombre'}) . ")" : ""), pandora_event ($pa_config, "Alert $text (" . safe_output($alert->{'name'}) . ") " . (defined ($module) ? 'assigned to ('. safe_output($module->{'nombre'}) . ")" : ""),
(defined ($agent) ? $agent->{'id_grupo'} : 0), (defined ($agent) ? $agent->{'id_agente'} : 0), $severity, (defined ($alert->{'id_template_module'}) ? $alert->{'id_template_module'} : 0), (defined ($agent) ? $agent->{'id_grupo'} : 0), (defined ($agent) ? $agent->{'id_agente'} : 0), $severity, (defined ($alert->{'id_template_module'}) ? $alert->{'id_template_module'} : 0),
@ -762,7 +783,7 @@ sub pandora_execute_action ($$$$$$$$$;$) {
} }
# Recovery fields, thanks to Kato Atsushi # Recovery fields, thanks to Kato Atsushi
if ($alert_mode == 0) { if ($alert_mode == RECOVERED_ALERT) {
# Field 1 is a special case where [RECOVER] prefix is not added even when it is defined # Field 1 is a special case where [RECOVER] prefix is not added even when it is defined
$field1 = $alert->{'field1_recovery'} ? $alert->{'field1_recovery'} : $field1; $field1 = $alert->{'field1_recovery'} ? $alert->{'field1_recovery'} : $field1;
$field1 = $action->{'field1_recovery'} ? $action->{'field1_recovery'} : $field1; $field1 = $action->{'field1_recovery'} ? $action->{'field1_recovery'} : $field1;

6
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -57,6 +57,8 @@ our @EXPORT = qw(
ICMPSERVER ICMPSERVER
SNMPSERVER SNMPSERVER
$DEVNULL $DEVNULL
RECOVERED_ALERT
FIRED_ALERT
cron_get_closest_in_range cron_get_closest_in_range
cron_next_execution cron_next_execution
cron_next_execution_date cron_next_execution_date
@ -106,6 +108,10 @@ use constant EVENTSERVER => 10;
use constant ICMPSERVER => 11; use constant ICMPSERVER => 11;
use constant SNMPSERVER => 12; use constant SNMPSERVER => 12;
# Alert modes
use constant RECOVERED_ALERT => 0;
use constant FIRED_ALERT => 1;
# /dev/null # /dev/null
our $DEVNULL = ($^O eq 'MSWin32') ? '/Nul' : '/dev/null'; our $DEVNULL = ($^O eq 'MSWin32') ? '/Nul' : '/dev/null';