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

2013-03-06 Sergio Martin <sergio.martin@artica.es> 

* lib/PandoraFMS/Core.pm: Add macros substitution in all the
	text fields of generate event command



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7793 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-03-06 12:40:22 +00:00
parent c84de026ec
commit 070cf760f2
2 changed files with 13 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-03-06 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Add macros substitution in all the
text fields of generate event command
2013-03-06 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Change the update count of fired alerts

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

@ -852,8 +852,15 @@ sub pandora_execute_action ($$$$$$$$$;$) {
# Pandora FMS Event
} elsif ($clean_name eq "Pandora FMS Event") {
$field1 = subst_alert_macros ($field1, \%macros);
$field3 = subst_alert_macros ($field3, \%macros);
$field4 = subst_alert_macros ($field4, \%macros);
$field6 = subst_alert_macros ($field6, \%macros);
$field7 = subst_alert_macros ($field7, \%macros);
$field8 = subst_alert_macros ($field8, \%macros);
# Field 1 (event text)
my $event_text = subst_alert_macros ($field1, \%macros);
my $event_text = $field1;
# Field 2 (event type)
my $event_type = $field2;