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

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

* lib/PandoraFMS/Core.pm: Add the new fields on snmp alerts
	(now there are 10 fields). Bug 3605775



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7784 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-03-05 15:09:40 +00:00
parent 0a1d100cda
commit ac7fa0046f
2 changed files with 19 additions and 0 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-05 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/Core.pm: Add the new fields on snmp alerts
(now there are 10 fields). Bug 3605775
2013-03-05 Sergio Martin <sergio.martin@artica.es>
* util/pandora_manage.pl: Add update counts when validate

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

@ -2762,6 +2762,13 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
$alert->{'al_field1'} = subst_alert_macros ($alert->{'al_field1'}, \%macros);
$alert->{'al_field2'} = subst_alert_macros ($alert->{'al_field2'}, \%macros);
$alert->{'al_field3'} = subst_alert_macros ($alert->{'al_field3'}, \%macros);
$alert->{'al_field4'} = subst_alert_macros ($alert->{'al_field4'}, \%macros);
$alert->{'al_field5'} = subst_alert_macros ($alert->{'al_field5'}, \%macros);
$alert->{'al_field6'} = subst_alert_macros ($alert->{'al_field6'}, \%macros);
$alert->{'al_field7'} = subst_alert_macros ($alert->{'al_field7'}, \%macros);
$alert->{'al_field8'} = subst_alert_macros ($alert->{'al_field8'}, \%macros);
$alert->{'al_field9'} = subst_alert_macros ($alert->{'al_field9'}, \%macros);
$alert->{'al_field10'} = subst_alert_macros ($alert->{'al_field10'}, \%macros);
# Check time threshold
$alert->{'last_fired'} = '1970-01-01 00:00:00' unless defined ($alert->{'last_fired'});
@ -2789,6 +2796,13 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
'field1' => $alert->{'al_field1'},
'field2' => $alert->{'al_field2'},
'field3' => $alert->{'al_field3'},
'field4' => $alert->{'al_field4'},
'field5' => $alert->{'al_field5'},
'field6' => $alert->{'al_field6'},
'field7' => $alert->{'al_field7'},
'field8' => $alert->{'al_field8'},
'field9' => $alert->{'al_field9'},
'field10' => $alert->{'al_field10'},
'description' => $alert->{'description'},
'times_fired' => $times_fired,
'time_threshold' => 0,