From 379e8693429531aba671711cb7499cef6085194f Mon Sep 17 00:00:00 2001 From: garnier-quentin Date: Mon, 15 Jun 2020 09:28:06 +0200 Subject: [PATCH] Fix #2049 --- .../netgear/readynas/snmp/mode/components/disk.pm | 15 +++++++++------ .../netgear/readynas/snmp/mode/components/psu.pm | 4 ++-- .../readynas/snmp/mode/components/temperature.pm | 14 ++++++++------ .../readynas/snmp/mode/components/volume.pm | 15 +++++++++------ 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/centreon-plugins/storage/netgear/readynas/snmp/mode/components/disk.pm b/centreon-plugins/storage/netgear/readynas/snmp/mode/components/disk.pm index aff596935..88902db9d 100644 --- a/centreon-plugins/storage/netgear/readynas/snmp/mode/components/disk.pm +++ b/centreon-plugins/storage/netgear/readynas/snmp/mode/components/disk.pm @@ -28,23 +28,26 @@ use warnings; my $mapping = { v6 => { diskState => { oid => '.1.3.6.1.4.1.4526.22.3.1.9' }, - diskTemperature => { oid => '.1.3.6.1.4.1.4526.22.3.1.10' }, + diskTemperature => { oid => '.1.3.6.1.4.1.4526.22.3.1.10' } }, v4 => { diskState => { oid => '.1.3.6.1.4.1.4526.18.3.1.4' }, - diskTemperature => { oid => '.1.3.6.1.4.1.4526.18.3.1.5' }, - }, + diskTemperature => { oid => '.1.3.6.1.4.1.4526.18.3.1.5' } + } }; my $oid_diskTable = { v4 => '.1.3.6.1.4.1.4526.18.3', - v6 => '.1.3.6.1.4.1.4526.22.3', + v6 => '.1.3.6.1.4.1.4526.22.3' }; sub load { my ($self) = @_; - push @{$self->{request}}, { oid => $oid_diskTable->{$self->{mib_ver}}, - start => $mapping->{$self->{mib_ver}}->{diskState}, end => $mapping->{$self->{mib_ver}}->{diskTemperature} }; + push @{$self->{request}}, { + oid => $oid_diskTable->{$self->{mib_ver}}, + start => $mapping->{$self->{mib_ver}}->{diskState}->{oid}, + end => $mapping->{$self->{mib_ver}}->{diskTemperature}->{oid} + }; } sub check { diff --git a/centreon-plugins/storage/netgear/readynas/snmp/mode/components/psu.pm b/centreon-plugins/storage/netgear/readynas/snmp/mode/components/psu.pm index c1c53eb8c..836649edb 100644 --- a/centreon-plugins/storage/netgear/readynas/snmp/mode/components/psu.pm +++ b/centreon-plugins/storage/netgear/readynas/snmp/mode/components/psu.pm @@ -30,8 +30,8 @@ my $mapping = { psuStatus => { oid => '.1.3.6.1.4.1.4526.22.8.1.3' }, }, v4 => { - psuStatus => { oid => '.1.3.6.1.4.1.4526.18.8.1.3' }, - }, + psuStatus => { oid => '.1.3.6.1.4.1.4526.18.8.1.3' } + } }; sub load { diff --git a/centreon-plugins/storage/netgear/readynas/snmp/mode/components/temperature.pm b/centreon-plugins/storage/netgear/readynas/snmp/mode/components/temperature.pm index b5e8f39fc..e65eac413 100644 --- a/centreon-plugins/storage/netgear/readynas/snmp/mode/components/temperature.pm +++ b/centreon-plugins/storage/netgear/readynas/snmp/mode/components/temperature.pm @@ -29,23 +29,25 @@ my $mapping = { v6 => { temperatureValue => { oid => '.1.3.6.1.4.1.4526.22.5.1.2' }, temperatureType => { oid => '.1.3.6.1.4.1.4526.22.5.1.3' }, - temperatureMax => { oid => '.1.3.6.1.4.1.4526.22.5.1.5' }, + temperatureMax => { oid => '.1.3.6.1.4.1.4526.22.5.1.5' } }, v4 => { temperatureValue => { oid => '.1.3.6.1.4.1.4526.18.5.1.2' }, - temperatureStatus => { oid => '.1.3.6.1.4.1.4526.18.5.1.3' }, - }, + temperatureStatus => { oid => '.1.3.6.1.4.1.4526.18.5.1.3' } + } }; my $oid_temperatureTable = { v4 => '.1.3.6.1.4.1.4526.18.5', - v6 => '.1.3.6.1.4.1.4526.22.5', + v6 => '.1.3.6.1.4.1.4526.22.5' }; sub load { my ($self) = @_; - push @{$self->{request}}, { oid => $oid_temperatureTable->{$self->{mib_ver}}, - start => $mapping->{$self->{mib_ver}}->{temperatureValue} }; + push @{$self->{request}}, { + oid => $oid_temperatureTable->{$self->{mib_ver}}, + start => $mapping->{$self->{mib_ver}}->{temperatureValue}->{oid} + }; } sub check { diff --git a/centreon-plugins/storage/netgear/readynas/snmp/mode/components/volume.pm b/centreon-plugins/storage/netgear/readynas/snmp/mode/components/volume.pm index 4756773fc..c4e5c6c7d 100644 --- a/centreon-plugins/storage/netgear/readynas/snmp/mode/components/volume.pm +++ b/centreon-plugins/storage/netgear/readynas/snmp/mode/components/volume.pm @@ -28,23 +28,26 @@ use warnings; my $mapping = { v6 => { volumeName => { oid => '.1.3.6.1.4.1.4526.22.7.1.2' }, - volumeStatus => { oid => '.1.3.6.1.4.1.4526.22.7.1.4' }, + volumeStatus => { oid => '.1.3.6.1.4.1.4526.22.7.1.4' } }, v4 => { volumeName => { oid => '.1.3.6.1.4.1.4526.18.7.1.2' }, - volumeStatus => { oid => '.1.3.6.1.4.1.4526.18.7.1.4' }, - }, + volumeStatus => { oid => '.1.3.6.1.4.1.4526.18.7.1.4' } + } }; my $oid_volumeTable = { v4 => '.1.3.6.1.4.1.4526.18.7', - v6 => '.1.3.6.1.4.1.4526.22.7', + v6 => '.1.3.6.1.4.1.4526.22.7' }; sub load { my ($self) = @_; - push @{$self->{request}}, { oid => $oid_volumeTable->{$self->{mib_ver}}, - start => $mapping->{$self->{mib_ver}}->{volumeName}, end => $mapping->{$self->{mib_ver}}->{volumeStatus} }; + push @{$self->{request}}, { + oid => $oid_volumeTable->{$self->{mib_ver}}, + start => $mapping->{$self->{mib_ver}}->{volumeName}->{oid}, + end => $mapping->{$self->{mib_ver}}->{volumeStatus}->{oid} + }; } sub check {