Fix Bugs #6070 & Bug #6068"

This commit is contained in:
Simon Bomm 2015-01-14 13:58:06 +01:00
parent dbeb2660b4
commit 95c59023af
5 changed files with 5 additions and 5 deletions

View File

@ -60,7 +60,7 @@ sub check {
return if (scalar(keys %$result) <= 0);
foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) {
next if ($key !~ /^$oid_fanSpeedSensorStatus\.(\d+)$/);
next if ($key !~ /^$oid_fanSpeedSensorStatus\.(\d+).(\d+)$/);
my $instance = $1;
next if ($self->check_exclude(section => 'fan', instance => $instance));

View File

@ -51,7 +51,7 @@ sub check {
return if (scalar(keys %$result) <= 0);
foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) {
$key =~ /^$oid_powerSupplyStatus\.(\d+)$/;
$key =~ /^$oid_powerSupplyStatus\.(\d+).(\d+)$/;
my $instance = $1;
next if ($self->check_exclude(section => 'psu', instance => $instance));

View File

@ -61,7 +61,7 @@ sub check {
return if (scalar(keys %$result) <= 0);
foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) {
next if ($key !~ /^$oid_tempertureSensorValue\.(\d+)$/);
next if ($key !~ /^$oid_tempertureSensorValue\.(\d+).(\d+)$/);
my $instance = $1;
next if ($self->check_exclude(section => 'temperature', instance => $instance));

View File

@ -60,7 +60,7 @@ sub check {
return if (scalar(keys %$result) <= 0);
foreach my $key ($self->{snmp}->oid_lex_sort(keys %$result)) {
next if ($key !~ /^$oid_voltageSensorStatus\.(\d+)$/);
next if ($key !~ /^$oid_voltageSensorStatus\.(\d+).(\d+)$/);
my $instance = $1;
next if ($self->check_exclude(section => 'voltage', instance => $instance));

View File

@ -67,7 +67,7 @@ sub run {
my $oid_haInstalled = '.1.3.6.1.4.1.2620.1.5.2.0';
my $oid_haState = '.1.3.6.1.4.1.2620.1.5.6.0';
my $oid_haStatCode = '.1.3.6.1.4.1.2620.1.6.7.2.2.0';
my $oid_haStatCode = '.1.3.6.1.4.1.2620.1.5.101';
my $oid_haStarted = '.1.3.6.1.4.1.2620.1.5.5.0';
my $result = $self->{snmp}->get_leef(oids => [$oid_haInstalled, $oid_haState, $oid_haStatCode, $oid_haStarted], nothing_quit => 1);