From e6c69beb6df565152a3ab0554663b8f548f16d1c Mon Sep 17 00:00:00 2001 From: hkosaka Date: Tue, 22 Oct 2013 10:16:47 +0000 Subject: [PATCH] 2013-10-22 Hirofumi Kosaka * lib/PandoraFMS/Core.pm: Fixed missing macro replacing in async modules' event description. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8945 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_server/ChangeLog | 5 +++++ pandora_server/lib/PandoraFMS/Core.pm | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog index 806ffe60d7..38abcba4ac 100644 --- a/pandora_server/ChangeLog +++ b/pandora_server/ChangeLog @@ -1,3 +1,8 @@ +2013-10-22 Hirofumi Kosaka + + * lib/PandoraFMS/Core.pm: Fixed missing macro replacing in + async modules' event description. + 2013-10-14 Junichi Satoh * NetBSD/pandora_server.conf: Updated default settings as the same diff --git a/pandora_server/lib/PandoraFMS/Core.pm b/pandora_server/lib/PandoraFMS/Core.pm index 19389f9a4b..573e6d6dc3 100644 --- a/pandora_server/lib/PandoraFMS/Core.pm +++ b/pandora_server/lib/PandoraFMS/Core.pm @@ -3935,7 +3935,9 @@ sub pandora_module_unknown ($$) { _module_ => safe_output($module->{'nombre'}), _data_ => 'N/A', ); - + load_module_macros ($module->{'module_macros'}, \%macros); + $description = subst_alert_macros ($description, \%macros); + pandora_event ($pa_config, $description, $agent->{'id_grupo'}, $module->{'id_agente'}, $severity, 0, $module->{'id_agente_modulo'}, $event_type, 0, $dbh, 'Pandora', '', '', '', '', $module->{'critical_instructions'}, $module->{'warning_instructions'}, $module->{'unknown_instructions'}); }