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

2013-10-22 Hirofumi Kosaka <kosaka@rworks.jp> 

* 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
This commit is contained in:
hkosaka 2013-10-22 10:16:47 +00:00
parent fd06a5a9f8
commit e6c69beb6d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2013-10-22 Hirofumi Kosaka <kosaka@rworks.jp>
* lib/PandoraFMS/Core.pm: Fixed missing macro replacing in
async modules' event description.
2013-10-14 Junichi Satoh <junichi@rworks.jp>
* NetBSD/pandora_server.conf: Updated default settings as the same

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

@ -3935,6 +3935,8 @@ 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'});