From 99c5599277dec236ccf67d3379ce0f6a0426e465 Mon Sep 17 00:00:00 2001 From: Quentin Garnier Date: Thu, 24 Jul 2014 15:45:30 +0200 Subject: [PATCH] Refs #5425 --- storage/emc/clariion/mode/spcomponents/battery.pm | 12 ++++++------ storage/emc/clariion/mode/spcomponents/cable.pm | 10 +++++----- storage/emc/clariion/mode/spcomponents/cpu.pm | 10 +++++----- storage/emc/clariion/mode/spcomponents/fan.pm | 10 +++++----- storage/emc/clariion/mode/spcomponents/iomodule.pm | 10 +++++----- storage/emc/clariion/mode/spcomponents/lcc.pm | 10 +++++----- storage/emc/clariion/mode/spcomponents/memory.pm | 10 +++++----- storage/emc/clariion/mode/spcomponents/psu.pm | 10 +++++----- storage/emc/clariion/mode/spcomponents/sp.pm | 10 +++++----- 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/storage/emc/clariion/mode/spcomponents/battery.pm b/storage/emc/clariion/mode/spcomponents/battery.pm index 7ec9d4d77..8aace3fa5 100644 --- a/storage/emc/clariion/mode/spcomponents/battery.pm +++ b/storage/emc/clariion/mode/spcomponents/battery.pm @@ -38,9 +38,9 @@ package storage::emc::clariion::mode::spcomponents::battery; use strict; use warnings; -my %conditions = ( - 1 => ['^Not Ready$' => 'WARNING'], - 2 => ['^(?!(Present|Valid)$)' => 'CRITICAL'], +my @conditions = ( + ['^Not Ready$' => 'WARNING'], + ['^(?!(Present|Valid)$)' => 'CRITICAL'], ); sub check { @@ -65,9 +65,9 @@ sub check { $self->{output}->output_add(long_msg => sprintf("Battery '%s' state is %s.", $instance, $state) ); - foreach (keys %conditions) { - if ($state =~ /${$conditions{$_}}[0]/i) { - $self->{output}->output_add(severity => ${$conditions{$_}}[1], + foreach (@conditions) { + if ($state =~ /$$_[0]/i) { + $self->{output}->output_add(severity => $$_[1], short_msg => sprintf("Battery '%s' state is %s", $instance, $state)); last; diff --git a/storage/emc/clariion/mode/spcomponents/cable.pm b/storage/emc/clariion/mode/spcomponents/cable.pm index fbda6c53c..f2de605e2 100644 --- a/storage/emc/clariion/mode/spcomponents/cable.pm +++ b/storage/emc/clariion/mode/spcomponents/cable.pm @@ -38,8 +38,8 @@ package storage::emc::clariion::mode::spcomponents::cable; use strict; use warnings; -my %conditions = ( - 1 => ['^(?!(Present|Valid)$)' => 'CRITICAL'], +my @conditions = ( + ['^(?!(Present|Valid)$)' => 'CRITICAL'], ); sub check { @@ -62,9 +62,9 @@ sub check { $self->{output}->output_add(long_msg => sprintf("cable '%s' state is %s.", $instance, $state) ); - foreach (keys %conditions) { - if ($state =~ /${$conditions{$_}}[0]/i) { - $self->{output}->output_add(severity => ${$conditions{$_}}[1], + foreach (@conditions) { + if ($state =~ /$$_[0]/i) { + $self->{output}->output_add(severity => $$_[1], short_msg => sprintf("cable '%s' state is %s", $instance, $state)); last; diff --git a/storage/emc/clariion/mode/spcomponents/cpu.pm b/storage/emc/clariion/mode/spcomponents/cpu.pm index 411c6ed72..5f7a0a212 100644 --- a/storage/emc/clariion/mode/spcomponents/cpu.pm +++ b/storage/emc/clariion/mode/spcomponents/cpu.pm @@ -38,8 +38,8 @@ package storage::emc::clariion::mode::spcomponents::cpu; use strict; use warnings; -my %conditions = ( - 1 => ['^(?!(Present|Valid)$)' => 'CRITICAL'], +my @conditions = ( + ['^(?!(Present|Valid)$)' => 'CRITICAL'], ); sub check { @@ -60,9 +60,9 @@ sub check { $self->{output}->output_add(long_msg => sprintf("cpu '%s' state is %s.", $instance, $state) ); - foreach (keys %conditions) { - if ($state =~ /${$conditions{$_}}[0]/i) { - $self->{output}->output_add(severity => ${$conditions{$_}}[1], + foreach (@conditions) { + if ($state =~ /$$_[0]/i) { + $self->{output}->output_add(severity => $$_[1], short_msg => sprintf("cpu '%s' state is %s", $instance, $state)); last; diff --git a/storage/emc/clariion/mode/spcomponents/fan.pm b/storage/emc/clariion/mode/spcomponents/fan.pm index 8e2ff2171..95f4dfcfc 100644 --- a/storage/emc/clariion/mode/spcomponents/fan.pm +++ b/storage/emc/clariion/mode/spcomponents/fan.pm @@ -38,8 +38,8 @@ package storage::emc::clariion::mode::spcomponents::fan; use strict; use warnings; -my %conditions = ( - 1 => ['^(?!(Present|Valid)$)' => 'CRITICAL'], +my @conditions = ( + ['^(?!(Present|Valid)$)' => 'CRITICAL'], ); sub check { @@ -60,9 +60,9 @@ sub check { $self->{output}->output_add(long_msg => sprintf("fan '%s' state is %s.", $instance, $state) ); - foreach (keys %conditions) { - if ($state =~ /${$conditions{$_}}[0]/i) { - $self->{output}->output_add(severity => ${$conditions{$_}}[1], + foreach (@conditions) { + if ($state =~ /$$_[0]/i) { + $self->{output}->output_add(severity => $$_[1], short_msg => sprintf("fan '%s' state is %s", $instance, $state)); last; diff --git a/storage/emc/clariion/mode/spcomponents/iomodule.pm b/storage/emc/clariion/mode/spcomponents/iomodule.pm index 696d274a5..0c823d01b 100644 --- a/storage/emc/clariion/mode/spcomponents/iomodule.pm +++ b/storage/emc/clariion/mode/spcomponents/iomodule.pm @@ -38,8 +38,8 @@ package storage::emc::clariion::mode::spcomponents::iomodule; use strict; use warnings; -my %conditions = ( - 1 => ['^(?!(Present|Valid)$)' => 'CRITICAL'], +my @conditions = ( + ['^(?!(Present|Valid)$)' => 'CRITICAL'], ); sub check { @@ -60,9 +60,9 @@ sub check { $self->{output}->output_add(long_msg => sprintf("I/O module '%s' state is %s.", $instance, $state) ); - foreach (keys %conditions) { - if ($state =~ /${$conditions{$_}}[0]/i) { - $self->{output}->output_add(severity => ${$conditions{$_}}[1], + foreach (@conditions) { + if ($state =~ /$$_[0]/i) { + $self->{output}->output_add(severity => $$_[1], short_msg => sprintf("I/O module '%s' state is %s", $instance, $state)); last; diff --git a/storage/emc/clariion/mode/spcomponents/lcc.pm b/storage/emc/clariion/mode/spcomponents/lcc.pm index 7596fea2a..a09128d1d 100644 --- a/storage/emc/clariion/mode/spcomponents/lcc.pm +++ b/storage/emc/clariion/mode/spcomponents/lcc.pm @@ -38,8 +38,8 @@ package storage::emc::clariion::mode::spcomponents::lcc; use strict; use warnings; -my %conditions = ( - 1 => ['^(?!(Present|Valid)$)' => 'CRITICAL'], +my @conditions = ( + ['^(?!(Present|Valid)$)' => 'CRITICAL'], ); sub check { @@ -60,9 +60,9 @@ sub check { $self->{output}->output_add(long_msg => sprintf("lcc '%s' state is %s.", $instance, $state) ); - foreach (keys %conditions) { - if ($state =~ /${$conditions{$_}}[0]/i) { - $self->{output}->output_add(severity => ${$conditions{$_}}[1], + foreach (@conditions) { + if ($state =~ /$$_[0]/i) { + $self->{output}->output_add(severity => $$_[1], short_msg => sprintf("lcc '%s' state is %s", $instance, $state)); last; diff --git a/storage/emc/clariion/mode/spcomponents/memory.pm b/storage/emc/clariion/mode/spcomponents/memory.pm index 3a0242f63..3098464fb 100644 --- a/storage/emc/clariion/mode/spcomponents/memory.pm +++ b/storage/emc/clariion/mode/spcomponents/memory.pm @@ -38,8 +38,8 @@ package storage::emc::clariion::mode::spcomponents::memory; use strict; use warnings; -my %conditions = ( - 1 => ['^(?!(Present|Valid)$)' => 'CRITICAL'], +my @conditions = ( + ['^(?!(Present|Valid)$)' => 'CRITICAL'], ); sub check { @@ -60,9 +60,9 @@ sub check { $self->{output}->output_add(long_msg => sprintf("Dimm '%s' state is %s.", $instance, $state) ); - foreach (keys %conditions) { - if ($state =~ /${$conditions{$_}}[0]/i) { - $self->{output}->output_add(severity => ${$conditions{$_}}[1], + foreach (@conditions) { + if ($state =~ /$$_[0]/i) { + $self->{output}->output_add(severity => $$_[1], short_msg => sprintf("Dimm '%s' state is %s", $instance, $state)); last; diff --git a/storage/emc/clariion/mode/spcomponents/psu.pm b/storage/emc/clariion/mode/spcomponents/psu.pm index 7ba98a7f5..73f33d02e 100644 --- a/storage/emc/clariion/mode/spcomponents/psu.pm +++ b/storage/emc/clariion/mode/spcomponents/psu.pm @@ -38,8 +38,8 @@ package storage::emc::clariion::mode::spcomponents::psu; use strict; use warnings; -my %conditions = ( - 1 => ['^(?!(Present|Valid)$)' => 'CRITICAL'], +my @conditions = ( + ['^(?!(Present|Valid)$)' => 'CRITICAL'], ); sub check { @@ -63,9 +63,9 @@ sub check { $self->{output}->output_add(long_msg => sprintf("Power Supply '%s' state is %s.", $instance, $state) ); - foreach (keys %conditions) { - if ($state =~ /${$conditions{$_}}[0]/i) { - $self->{output}->output_add(severity => ${$conditions{$_}}[1], + foreach (@conditions) { + if ($state =~ /$$_[0]/i) { + $self->{output}->output_add(severity => $$_[1], short_msg => sprintf("Power Supply '%s' state is %s", $instance, $state)); last; diff --git a/storage/emc/clariion/mode/spcomponents/sp.pm b/storage/emc/clariion/mode/spcomponents/sp.pm index 1973075f3..bde1e50ff 100644 --- a/storage/emc/clariion/mode/spcomponents/sp.pm +++ b/storage/emc/clariion/mode/spcomponents/sp.pm @@ -38,8 +38,8 @@ package storage::emc::clariion::mode::spcomponents::sp; use strict; use warnings; -my %conditions = ( - 1 => ['^(?!(Present|Valid)$)' => 'CRITICAL'], +my @conditions = ( + ['^(?!(Present|Valid)$)' => 'CRITICAL'], ); sub check { @@ -60,9 +60,9 @@ sub check { $self->{output}->output_add(long_msg => sprintf("sp '%s' state is %s.", $instance, $state) ); - foreach (keys %conditions) { - if ($state =~ /${$conditions{$_}}[0]/i) { - $self->{output}->output_add(severity => ${$conditions{$_}}[1], + foreach (@conditions) { + if ($state =~ /$$_[0]/i) { + $self->{output}->output_add(severity => $$_[1], short_msg => sprintf("sp '%s' state is %s", $instance, $state)); last;