From 8c049f5590bcaaa6464b5cafbf311f13aadaaba6 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Fri, 11 Jan 2013 12:20:16 +0000 Subject: [PATCH] 2013-01-11 Juan Manuel Ramon * lib/PandoraFMS/Core.pm: Fixed _id_alert_ macro in events. Merged from branches. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7434 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 6 ++++++ pandora_server/lib/PandoraFMS/Core.pm | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index b55b1bb4fa..7581eebd84 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,9 @@ +2013-01-11 Juan Manuel Ramon + + * lib/PandoraFMS/Core.pm: Fixed _id_alert_ macro in events. + + Merged from branches. + 2013-01-10 Dario Rodriguez * lib/PandoraFMS/PluginServer.pm: Added log traces for plugin error diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 940a7299cb..39396602f8 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -877,7 +877,7 @@ sub pandora_execute_action ($$$$$$$$$;$) { _modulestatus_ => (defined ($module)) ? get_agentmodule_status($pa_config, $dbh, $module->{'id_agente_modulo'}) : '', _moduletags_ => (defined ($module)) ? pandora_get_module_tags ($pa_config, $dbh, $module->{'id_agente_modulo'}) : '', _id_agent_ => (defined ($module)) ? $module->{'id_agente'} : '', - _id_alert_ => $alert->{'id'}, + _id_alert_ => (defined ($alert->{'id_template_module'})) ? $alert->{'id_template_module'} : '', _interval_ => (defined ($module) && $module->{'module_interval'} != 0) ? $module->{'module_interval'} : (defined ($agent)) ? $agent->{'intervalo'} : '', _target_ip_ => (defined ($module)) ? $module->{'ip_target'} : '', _target_port_ => (defined ($module)) ? $module->{'tcp_port'} : '',