tyler.durden/centreon-plugins
1
0
Fork 0
mirror of https://github.com/centreon/centreon-plugins.git synced 2025-09-25 18:58:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2249 (#2259)

Browse Source
This commit is contained in:
qgarnier 2020-10-16 14:52:25 +02:00 committed by GitHub
parent 15fedef013
commit 8e34ef8d10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
storage/nimble/restapi/mode/components/fan.pm
View File

@ -40,6 +40,7 @@ sub check {
foreach my $array (@{$self->{results}->{shelve}->{data}}) { foreach my $array (@{$self->{results}->{shelve}->{data}}) {
my $array_name = $array->{array_name}; my $array_name = $array->{array_name};
$array_name .= ':' . $array->{serial} if ($self->use_serial());
foreach my $ctrl (@{$array->{ctrlrs}}) { foreach my $ctrl (@{$array->{ctrlrs}}) {
foreach my $sensor (@{$ctrl->{ctrlr_sensors}}) { foreach my $sensor (@{$ctrl->{ctrlr_sensors}}) {

1
storage/nimble/restapi/mode/components/psu.pm
View File

@ -40,6 +40,7 @@ sub check {
foreach my $array (@{$self->{results}->{shelve}->{data}}) { foreach my $array (@{$self->{results}->{shelve}->{data}}) {
my $array_name = $array->{array_name}; my $array_name = $array->{array_name};
$array_name .= ':' . $array->{serial} if ($self->use_serial());
foreach my $sensor (@{$array->{chassis_sensors}}) { foreach my $sensor (@{$array->{chassis_sensors}}) {
next if ($sensor->{type} ne 'power supply'); next if ($sensor->{type} ne 'power supply');

1
storage/nimble/restapi/mode/components/temperature.pm
View File

@ -40,6 +40,7 @@ sub check {
foreach my $array (@{$self->{results}->{shelve}->{data}}) { foreach my $array (@{$self->{results}->{shelve}->{data}}) {
my $array_name = $array->{array_name}; my $array_name = $array->{array_name};
$array_name .= ':' . $array->{serial} if ($self->use_serial());
foreach my $ctrl (@{$array->{ctrlrs}}) { foreach my $ctrl (@{$array->{ctrlrs}}) {
foreach my $sensor (@{$ctrl->{ctrlr_sensors}}) { foreach my $sensor (@{$ctrl->{ctrlr_sensors}}) {

18
storage/nimble/restapi/mode/hardware.pm
View File

@ -73,6 +73,24 @@ sub new {
return $self; return $self;
} }
sub use_serial {
my ($self, %options) = @_;
return $self->{use_serial} if (defined($self->{use_serial}));
$self->{use_serial} = 0;
my $array_names = {};
foreach (@{$self->{results}->{shelve}->{data}}) {
if (defined($array_names->{ $_->{array_name} })) {
$self->{use_serial} = 1;
last;
}
$array_names->{ $_->{array_name} } = 1;
}
return $self->{use_serial};
}
sub execute_custom { sub execute_custom {
my ($self, %options) = @_; my ($self, %options) = @_;