tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-30 01:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add action information to alert events.

Browse Source
This commit is contained in:
Ramon Novoa 2021-09-13 13:13:46 +02:00
parent 4ec67b51b7
commit 74ae4efa9a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -924,6 +924,13 @@ sub pandora_execute_alert ($$$$$$$$$;$$) {
return;
}
# Additional execution information for the console.
my $custom_data = {
'actions' => [],
'forced' => $forced_alert ? 1 : 0,
'recovered' => $alert_mode == RECOVERED_ALERT ? 1 : 0
};
# Critical_instructions, warning_instructions, unknown_instructions
my $critical_instructions = get_db_value ($dbh, 'SELECT critical_instructions FROM tagente_modulo WHERE id_agente_modulo = ?', $alert->{'id_agent_module'});
my $warning_instructions = get_db_value ($dbh, 'SELECT warning_instructions FROM tagente_modulo WHERE id_agente_modulo = ?', $alert->{'id_agent_module'});
@ -950,6 +957,7 @@ sub pandora_execute_alert ($$$$$$$$$;$$) {
}
pandora_execute_action ($pa_config, $data, $agent, $alert, $alert_mode, $action, $module, $dbh, $timestamp, $extra_macros);
push(@{$custom_data->{'actions'}}, safe_output($action->{'name'}));
} else {
if (defined ($module)) {
logger ($pa_config, "Skipping action " . safe_output($action->{'name'}) . " for alert '" . safe_output($alert->{'name'}) . "' module '" . safe_output($module->{'nombre'}) . "'.", 10);
@ -986,7 +994,8 @@ sub pandora_execute_alert ($$$$$$$$$;$$) {
'',
$critical_instructions,
$warning_instructions,
$unknown_instructions
$unknown_instructions,
p_encode_json($pa_config, $custom_data)
);
} else {
pandora_event (
@ -1007,7 +1016,8 @@ sub pandora_execute_alert ($$$$$$$$$;$$) {
'',
$critical_instructions,
$warning_instructions,
$unknown_instructions
$unknown_instructions,
p_encode_json($pa_config, $custom_data)
);
}
}