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

2014-03-27 Vanessa Gil <vanessa.gil@artica.es> 

* lib/PandoraFMS/Core.pm: Can change
	order in varbinds.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9652 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
vgilc 2014-03-27 10:52:18 +00:00
parent cf245d19df
commit 64306ce66d
2 changed files with 9 additions and 2 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 @@
2014-03-27 Vanessa Gil <vanessa.gil@artica.es>
* lib/PandoraFMS/Core.pm: Can change
order in varbinds.
2014-03-20 Sancho Lerena <slerena@artica.es> 2014-03-20 Sancho Lerena <slerena@artica.es>
* conf/pandora_server.conf.new, * conf/pandora_server.conf.new,

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

@ -2837,10 +2837,12 @@ sub pandora_evaluate_snmp_alerts ($$$$$$$$$) {
my @custom_values = split ("\t", $trap_custom_oid); my @custom_values = split ("\t", $trap_custom_oid);
for ($count = 1; defined ($custom_values[$count-1]); $count++) { for ($count = 1; defined ($custom_values[$count-1]); $count++) {
my $macro_name = '_snmp_f' . $count . '_'; my $macro_name = '_snmp_f' . $count . '_';
my $order_field = $alert->{'order_'.$count};
#~ my $order_field = $order_field - 1;
if ($custom_values[$count-1] =~ m/= \S+: (.*)/) { if ($custom_values[($order_field-1)] =~ m/= \S+: (.*)/) {
my $value = $1; my $value = $1;
# Strip leading and trailing double quotes # Strip leading and trailing double quotes
$value =~ s/^"//; $value =~ s/^"//;
$value =~ s/"$//; $value =~ s/"$//;