From e71883d72820e1a846dd3b194d5248602b13d886 Mon Sep 17 00:00:00 2001 From: Kevin Duret Date: Wed, 29 Oct 2014 08:05:45 +0100 Subject: [PATCH] fix status output refs #5168 --- hardware/server/cisco/ucs/mode/components/iocard.pm | 6 +++--- hardware/server/cisco/ucs/mode/components/psu.pm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hardware/server/cisco/ucs/mode/components/iocard.pm b/hardware/server/cisco/ucs/mode/components/iocard.pm index deb6d07d0..b11a7c708 100644 --- a/hardware/server/cisco/ucs/mode/components/iocard.pm +++ b/hardware/server/cisco/ucs/mode/components/iocard.pm @@ -82,14 +82,14 @@ sub check { $self->{components}->{iocard}->{total}++; $self->{output}->output_add(long_msg => sprintf("IO cards '%s' state is '%s' [presence: %s].", - $iocard_dn, ${$thresholds->{overall_status}->{$iocard_operstate}}[0], + $iocard_dn, ${$thresholds->{operability}->{$iocard_operstate}}[0], ${$thresholds->{presence}->{$iocard_presence}}[0] )); - $exit = $self->get_severity(section => 'iocard', threshold => 'overall_status', value => $iocard_operstate); + $exit = $self->get_severity(section => 'iocard', threshold => 'operability', value => $iocard_operstate); if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { $self->{output}->output_add(severity => $exit, short_msg => sprintf("IO cards '%s' state is '%s'.", - $iocard_dn, ${$thresholds->{overall_status}->{$iocard_operstate}}[0] + $iocard_dn, ${$thresholds->{operability}->{$iocard_operstate}}[0] ) ); } diff --git a/hardware/server/cisco/ucs/mode/components/psu.pm b/hardware/server/cisco/ucs/mode/components/psu.pm index 44e5c7bf4..a60cfc630 100644 --- a/hardware/server/cisco/ucs/mode/components/psu.pm +++ b/hardware/server/cisco/ucs/mode/components/psu.pm @@ -82,14 +82,14 @@ sub check { $self->{components}->{psu}->{total}++; $self->{output}->output_add(long_msg => sprintf("power supply '%s' state is '%s' [presence: %s].", - $psu_dn, ${$thresholds->{overall_status}->{$psu_operstate}}[0], + $psu_dn, ${$thresholds->{operability}->{$psu_operstate}}[0], ${$thresholds->{presence}->{$psu_presence}}[0] )); - $exit = $self->get_severity(section => 'psu', threshold => 'overall_status', value => $psu_operstate); + $exit = $self->get_severity(section => 'psu', threshold => 'operability', value => $psu_operstate); if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { $self->{output}->output_add(severity => $exit, short_msg => sprintf("power supply '%s' state is '%s'.", - $psu_dn, ${$thresholds->{overall_status}->{$psu_operstate}}[0] + $psu_dn, ${$thresholds->{operability}->{$psu_operstate}}[0] ) ); }