From 55abf42a3b289d37ad0bb9e14b9ccf1806498970 Mon Sep 17 00:00:00 2001 From: Quentin Garnier Date: Fri, 13 Mar 2015 10:28:49 +1100 Subject: [PATCH] Refs #6201 Indentation please ;) --- .../storage/hp/3par/7000/mode/battery.pm | 62 ++++---- .../storage/hp/3par/7000/mode/cim.pm | 64 ++++---- .../storage/hp/3par/7000/mode/iscsi.pm | 62 ++++---- .../storage/hp/3par/7000/mode/node.pm | 60 ++++---- .../storage/hp/3par/7000/mode/physicaldisk.pm | 58 ++++---- .../storage/hp/3par/7000/mode/psu.pm | 62 ++++---- .../storage/hp/3par/7000/mode/storage.pm | 110 +++++++------- .../storage/hp/3par/7000/mode/temperature.pm | 70 ++++----- .../storage/hp/3par/7000/mode/volume.pm | 140 +++++++++--------- .../storage/hp/3par/7000/mode/wsapi.pm | 60 ++++---- .../storage/hp/3par/7000/plugin.pm | 16 +- 11 files changed, 374 insertions(+), 390 deletions(-) diff --git a/centreon-plugins/storage/hp/3par/7000/mode/battery.pm b/centreon-plugins/storage/hp/3par/7000/mode/battery.pm index 9a1e4abc4..ad14fa7ce 100644 --- a/centreon-plugins/storage/hp/3par/7000/mode/battery.pm +++ b/centreon-plugins/storage/hp/3par/7000/mode/battery.pm @@ -40,11 +40,11 @@ use base qw(centreon::plugins::mode); use strict; use warnings; -my %states = ( - 'ok' => 'OK', - 'new' => 'OK', - 'degraded' => 'WARNING', - 'failed' => 'CRITICAL', +my %states = ( + 'ok' => 'OK', + 'new' => 'OK', + 'degraded' => 'WARNING', + 'failed' => 'CRITICAL', ); sub new { @@ -55,7 +55,7 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname' }, + "hostname:s" => { name => 'hostname' }, "timeout:s" => { name => 'timeout', default => 30 }, "sudo" => { name => 'sudo' }, "ssh-option:s@" => { name => 'ssh_option' }, @@ -72,9 +72,9 @@ sub check_options { my ($self, %options) = @_; $self->SUPER::init(%options); - if (!defined($self->{option_results}->{hostname})) { - $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); - $self->{output}->option_exit(); + if (!defined($self->{option_results}->{hostname})) { + $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); + $self->{output}->option_exit(); } if (defined($self->{option_results}->{no_component})) { @@ -89,8 +89,8 @@ sub check_options { sub run { my ($self, %options) = @_; - $self->{option_results}->{remote} = 1; - my $stdout = centreon::plugins::misc::execute(output => $self->{output}, + $self->{option_results}->{remote} = 1; + my $stdout = centreon::plugins::misc::execute(output => $self->{output}, options => $self->{option_results}, sudo => $self->{option_results}->{sudo}, command => "showbattery", @@ -98,27 +98,27 @@ sub run { command_options => $self->{option_results}->{command_options}); - my $total_components = 0; - my @batteries = split("\n",$stdout); - foreach my $battery (@batteries) { - if ($battery =~ /\d+\s+(\d+)\s+(\d+)\s+\S+\s+(\S+)\s+(\d+)/) { - $total_components++; - my $psuId = $1; - my $batteryId = $2; - my $batteryState = $3; - my $batteryChrgLvl = $4; + my $total_components = 0; + my @batteries = split("\n",$stdout); + foreach my $battery (@batteries) { + if ($battery =~ /\d+\s+(\d+)\s+(\d+)\s+\S+\s+(\S+)\s+(\d+)/) { + $total_components++; + my $psuId = $1; + my $batteryId = $2; + my $batteryState = $3; + my $batteryChrgLvl = $4; - $self->{output}->output_add(long_msg => sprintf("Battery '%d' on power supply '%d' is '%s' [Battery charge level: '%d%%']", $batteryId, $psuId, $batteryState, $batteryChrgLvl)); - if ($states{lc($batteryState)} ne 'OK'){ - $self->{output}->output_add(severity => $states{lc($batteryState)}, - short_msg => sprintf("Battery '%d' on power supply '%d' state is '%s' [Battery charge level: '%d%%']", $batteryId, $psuId, $batteryState, $batteryChrgLvl)); - } - } - } + $self->{output}->output_add(long_msg => sprintf("Battery '%d' on power supply '%d' is '%s' [Battery charge level: '%d%%']", $batteryId, $psuId, $batteryState, $batteryChrgLvl)); + if ($states{lc($batteryState)} ne 'OK'){ + $self->{output}->output_add(severity => $states{lc($batteryState)}, + short_msg => sprintf("Battery '%d' on power supply '%d' state is '%s' [Battery charge level: '%d%%']", $batteryId, $psuId, $batteryState, $batteryChrgLvl)); + } + } + } - $self->{output}->output_add(severity => 'OK', + $self->{output}->output_add(severity => 'OK', short_msg => sprintf("All %d batteries are ok.", $total_components)); - + if (defined($self->{option_results}->{no_component}) && $total_components == 0) { $self->{output}->output_add(severity => $self->{no_components}, short_msg => 'No components are checked.'); @@ -169,6 +169,4 @@ If total (with skipped) is 0. (Default: 'critical' returns). =back -=cut - - +=cut \ No newline at end of file diff --git a/centreon-plugins/storage/hp/3par/7000/mode/cim.pm b/centreon-plugins/storage/hp/3par/7000/mode/cim.pm index cf78f2d3d..7200f0647 100644 --- a/centreon-plugins/storage/hp/3par/7000/mode/cim.pm +++ b/centreon-plugins/storage/hp/3par/7000/mode/cim.pm @@ -48,13 +48,13 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname' }, + "hostname:s" => { name => 'hostname' }, "timeout:s" => { name => 'timeout', default => 30 }, "sudo" => { name => 'sudo' }, "ssh-option:s@" => { name => 'ssh_option' }, "ssh-path:s" => { name => 'ssh_path' }, "ssh-command:s" => { name => 'ssh_command', default => 'ssh' }, - "no-cim:s" => { name => 'no_cim' }, + "no-cim:s" => { name => 'no_cim' }, }); $self->{no_cim} = undef; return $self; @@ -64,9 +64,9 @@ sub check_options { my ($self, %options) = @_; $self->SUPER::init(%options); - if (!defined($self->{option_results}->{hostname})) { - $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); - $self->{output}->option_exit(); + if (!defined($self->{option_results}->{hostname})) { + $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); + $self->{output}->option_exit(); } if (defined($self->{option_results}->{no_cim})) { @@ -81,8 +81,8 @@ sub check_options { sub run { my ($self, %options) = @_; - $self->{option_results}->{remote} = 1; - my $stdout = centreon::plugins::misc::execute(output => $self->{output}, + $self->{option_results}->{remote} = 1; + my $stdout = centreon::plugins::misc::execute(output => $self->{output}, options => $self->{option_results}, sudo => $self->{option_results}->{sudo}, command => "showcim", @@ -90,34 +90,34 @@ sub run { command_options => $self->{option_results}->{command_options}); - my @results = split("\n",$stdout); - my $total_cim = 0; - foreach my $result (@results) { - if ($result =~ /(\S+)\s+(\S+)\s+(\S+)\s+(\d+)\s+(\S+)\s+(\d+)\s+(\S+)\s+(\d+)\s+\S+/) { - $total_cim++; - my $serviceStatus = $1; - my $serviceState = $2; - my $slpState = $3; - my $slpPort = $4; - my $httpState = $5; - my $httpPort = $6; - my $httpsState = $7; + my @results = split("\n",$stdout); + my $total_cim = 0; + foreach my $result (@results) { + if ($result =~ /(\S+)\s+(\S+)\s+(\S+)\s+(\d+)\s+(\S+)\s+(\d+)\s+(\S+)\s+(\d+)\s+\S+/) { + $total_cim++; + my $serviceStatus = $1; + my $serviceState = $2; + my $slpState = $3; + my $slpPort = $4; + my $httpState = $5; + my $httpPort = $6; + my $httpsState = $7; my $httpsPort = $8; - $self->{output}->output_add(long_msg => sprintf("CIM service is '%s' and '%s' [SLP on port %d is %s] [HTTP on port %d is %s] [HTTPS on port %d is %s]", - $serviceStatus, $serviceState, $slpPort, $slpState, $httpPort, $httpState, $httpsPort ,$httpsState)); - if ((lc($serviceStatus) ne 'enabled') || (lc($serviceState) ne 'active')){ - $self->{output}->output_add(severity => 'critical', - short_msg => sprintf("CIM service is '%s' and '%s' [SLP on port %d is %s] [HTTP on port %d is %s] [HTTPS on port %d is %s]", + $self->{output}->output_add(long_msg => sprintf("CIM service is '%s' and '%s' [SLP on port %d is %s] [HTTP on port %d is %s] [HTTPS on port %d is %s]", $serviceStatus, $serviceState, $slpPort, $slpState, $httpPort, $httpState, $httpsPort ,$httpsState)); - } - } - } + if ((lc($serviceStatus) ne 'enabled') || (lc($serviceState) ne 'active')){ + $self->{output}->output_add(severity => 'critical', + short_msg => sprintf("CIM service is '%s' and '%s' [SLP on port %d is %s] [HTTP on port %d is %s] [HTTPS on port %d is %s]", + $serviceStatus, $serviceState, $slpPort, $slpState, $httpPort, $httpState, $httpsPort ,$httpsState)); + } + } + } - $self->{output}->output_add(severity => 'OK', + $self->{output}->output_add(severity => 'OK', short_msg => 'CIM service is ok.'); - - if (defined($self->{option_results}->{no_cim}) && $total_cim == 0) { + + if (defined($self->{option_results}->{no_cim}) && $total_cim == 0) { $self->{output}->output_add(severity => $self->{no_cim}, short_msg => 'No CIM service is checked.'); } @@ -167,6 +167,4 @@ If total (with skipped) is 0. (Default: 'critical' returns). =back -=cut - - +=cut \ No newline at end of file diff --git a/centreon-plugins/storage/hp/3par/7000/mode/iscsi.pm b/centreon-plugins/storage/hp/3par/7000/mode/iscsi.pm index 82b074c09..73a1fe4a7 100644 --- a/centreon-plugins/storage/hp/3par/7000/mode/iscsi.pm +++ b/centreon-plugins/storage/hp/3par/7000/mode/iscsi.pm @@ -40,10 +40,10 @@ use base qw(centreon::plugins::mode); use strict; use warnings; -my %states = ( - 'ready' => 'OK', - 'loss_sync' => 'WARNING', - 'offline' => 'CRITICAL', +my %states = ( + 'ready' => 'OK', + 'loss_sync' => 'WARNING', + 'offline' => 'CRITICAL', ); sub new { @@ -54,7 +54,7 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname' }, + "hostname:s" => { name => 'hostname' }, "timeout:s" => { name => 'timeout', default => 30 }, "sudo" => { name => 'sudo' }, "ssh-option:s@" => { name => 'ssh_option' }, @@ -71,9 +71,9 @@ sub check_options { my ($self, %options) = @_; $self->SUPER::init(%options); - if (!defined($self->{option_results}->{hostname})) { - $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); - $self->{output}->option_exit(); + if (!defined($self->{option_results}->{hostname})) { + $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); + $self->{output}->option_exit(); } if (defined($self->{option_results}->{no_component})) { @@ -88,8 +88,8 @@ sub check_options { sub run { my ($self, %options) = @_; - $self->{option_results}->{remote} = 1; - my $stdout = centreon::plugins::misc::execute(output => $self->{output}, + $self->{option_results}->{remote} = 1; + my $stdout = centreon::plugins::misc::execute(output => $self->{output}, options => $self->{option_results}, sudo => $self->{option_results}->{sudo}, command => "showport", @@ -97,27 +97,27 @@ sub run { command_options => $self->{option_results}->{command_options}); - my $total_components = 0; - my @iscsis = split("\n",$stdout); - foreach my $iscsi (@iscsis) { - if ($iscsi =~ /(\S+)\s+\S+\s+(\S+)\s+\S+\s+\S+\s+(\S+)/) { - my $iscsiNsp = $1; - my $iscsiState = $2; - my $iscsiType = $3; - if($iscsiType eq 'iscsi') { - $self->{output}->output_add(long_msg => sprintf("Interface '%s' is '%s'", $iscsiNsp, $iscsiState)); - if ($states{lc($iscsiState)} ne 'OK'){ - $self->{output}->output_add(severity => $states{lc($iscsiState)}, - short_msg => sprintf("Interface '%s' is '%s'", $iscsiNsp, $iscsiState)); - } - $total_components++; - } - } - } + my $total_components = 0; + my @iscsis = split("\n",$stdout); + foreach my $iscsi (@iscsis) { + if ($iscsi =~ /(\S+)\s+\S+\s+(\S+)\s+\S+\s+\S+\s+(\S+)/) { + my $iscsiNsp = $1; + my $iscsiState = $2; + my $iscsiType = $3; + if($iscsiType eq 'iscsi') { + $self->{output}->output_add(long_msg => sprintf("Interface '%s' is '%s'", $iscsiNsp, $iscsiState)); + if ($states{lc($iscsiState)} ne 'OK'){ + $self->{output}->output_add(severity => $states{lc($iscsiState)}, + short_msg => sprintf("Interface '%s' is '%s'", $iscsiNsp, $iscsiState)); + } + $total_components++; + } + } + } - $self->{output}->output_add(severity => 'OK', + $self->{output}->output_add(severity => 'OK', short_msg => sprintf("All %d ISCSIs are ok.", $total_components)); - + if (defined($self->{option_results}->{no_component}) && $total_components == 0) { $self->{output}->output_add(severity => $self->{no_components}, short_msg => 'No components are checked.'); @@ -168,6 +168,4 @@ If total (with skipped) is 0. (Default: 'critical' returns). =back -=cut - - +=cut \ No newline at end of file diff --git a/centreon-plugins/storage/hp/3par/7000/mode/node.pm b/centreon-plugins/storage/hp/3par/7000/mode/node.pm index aad4789a8..b95532f4a 100644 --- a/centreon-plugins/storage/hp/3par/7000/mode/node.pm +++ b/centreon-plugins/storage/hp/3par/7000/mode/node.pm @@ -40,11 +40,11 @@ use base qw(centreon::plugins::mode); use strict; use warnings; -my %states = ( - 'ok' => 'OK', - 'new' => 'OK', - 'degraded' => 'WARNING', - 'failed' => 'CRITICAL', +my %states = ( + 'ok' => 'OK', + 'new' => 'OK', + 'degraded' => 'WARNING', + 'failed' => 'CRITICAL', ); sub new { @@ -55,7 +55,7 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname' }, + "hostname:s" => { name => 'hostname' }, "timeout:s" => { name => 'timeout', default => 30 }, "sudo" => { name => 'sudo' }, "ssh-option:s@" => { name => 'ssh_option' }, @@ -72,9 +72,9 @@ sub check_options { my ($self, %options) = @_; $self->SUPER::init(%options); - if (!defined($self->{option_results}->{hostname})) { - $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); - $self->{output}->option_exit(); + if (!defined($self->{option_results}->{hostname})) { + $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); + $self->{output}->option_exit(); } if (defined($self->{option_results}->{no_component})) { @@ -89,8 +89,8 @@ sub check_options { sub run { my ($self, %options) = @_; - $self->{option_results}->{remote} = 1; - my $stdout = centreon::plugins::misc::execute(output => $self->{output}, + $self->{option_results}->{remote} = 1; + my $stdout = centreon::plugins::misc::execute(output => $self->{output}, options => $self->{option_results}, sudo => $self->{option_results}->{sudo}, command => "shownode -s", @@ -98,26 +98,26 @@ sub run { command_options => $self->{option_results}->{command_options}); - my $total_components = 0; - my @nodes = split("\n",$stdout); - foreach my $node (@nodes) { - if ($node =~ /(\d+)\s+(\S+)\s+(\S+)/) { - $total_components++; - my $nodeId = $1; - my $nodeState = $2; - my $detailNodeState = $3; + my $total_components = 0; + my @nodes = split("\n",$stdout); + foreach my $node (@nodes) { + if ($node =~ /(\d+)\s+(\S+)\s+(\S+)/) { + $total_components++; + my $nodeId = $1; + my $nodeState = $2; + my $detailNodeState = $3; - $self->{output}->output_add(long_msg => sprintf("Node '%d' state is '%s' [Detailed State: %s]", $nodeId, $nodeState, $detailNodeState)); - if ($states{lc($nodeState)} ne 'OK'){ - $self->{output}->output_add(severity => $states{lc($nodeState)}, - short_msg => sprintf("Node '%d' state is '%s' [Detailed State: %s]", $nodeId, $nodeState, $detailNodeState)); - } - } - } + $self->{output}->output_add(long_msg => sprintf("Node '%d' state is '%s' [Detailed State: %s]", $nodeId, $nodeState, $detailNodeState)); + if ($states{lc($nodeState)} ne 'OK'){ + $self->{output}->output_add(severity => $states{lc($nodeState)}, + short_msg => sprintf("Node '%d' state is '%s' [Detailed State: %s]", $nodeId, $nodeState, $detailNodeState)); + } + } + } - $self->{output}->output_add(severity => 'OK', + $self->{output}->output_add(severity => 'OK', short_msg => sprintf("All %d nodes are ok.", $total_components)); - + if (defined($self->{option_results}->{no_component}) && $total_components == 0) { $self->{output}->output_add(severity => $self->{no_components}, short_msg => 'No components are checked.'); @@ -168,6 +168,4 @@ If total (with skipped) is 0. (Default: 'critical' returns). =back -=cut - - +=cut \ No newline at end of file diff --git a/centreon-plugins/storage/hp/3par/7000/mode/physicaldisk.pm b/centreon-plugins/storage/hp/3par/7000/mode/physicaldisk.pm index 8dc14865e..cb45ecb55 100644 --- a/centreon-plugins/storage/hp/3par/7000/mode/physicaldisk.pm +++ b/centreon-plugins/storage/hp/3par/7000/mode/physicaldisk.pm @@ -40,11 +40,11 @@ use base qw(centreon::plugins::mode); use strict; use warnings; -my %states = ( - 'normal' => 'OK', - 'new' => 'OK', - 'degraded' => 'WARNING', - 'failed' => 'CRITICAL', +my %states = ( + 'normal' => 'OK', + 'new' => 'OK', + 'degraded' => 'WARNING', + 'failed' => 'CRITICAL', ); sub new { @@ -55,7 +55,7 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname' }, + "hostname:s" => { name => 'hostname' }, "timeout:s" => { name => 'timeout', default => 30 }, "sudo" => { name => 'sudo' }, "ssh-option:s@" => { name => 'ssh_option' }, @@ -72,9 +72,9 @@ sub check_options { my ($self, %options) = @_; $self->SUPER::init(%options); - if (!defined($self->{option_results}->{hostname})) { - $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); - $self->{output}->option_exit(); + if (!defined($self->{option_results}->{hostname})) { + $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); + $self->{output}->option_exit(); } if (defined($self->{option_results}->{no_component})) { @@ -89,8 +89,8 @@ sub check_options { sub run { my ($self, %options) = @_; - $self->{option_results}->{remote} = 1; - my $stdout = centreon::plugins::misc::execute(output => $self->{output}, + $self->{option_results}->{remote} = 1; + my $stdout = centreon::plugins::misc::execute(output => $self->{output}, options => $self->{option_results}, sudo => $self->{option_results}->{sudo}, command => "showpd -showcols Id,State", @@ -98,25 +98,25 @@ sub run { command_options => $self->{option_results}->{command_options}); - my $total_components = 0; - my @disks = split("\n",$stdout); - foreach my $disk (@disks) { - if ($disk =~ /(\d+)\s+(\S+)/) { - $total_components++; - my $diskId = $1; - my $diskState = $2; + my $total_components = 0; + my @disks = split("\n",$stdout); + foreach my $disk (@disks) { + if ($disk =~ /(\d+)\s+(\S+)/) { + $total_components++; + my $diskId = $1; + my $diskState = $2; - $self->{output}->output_add(long_msg => sprintf("Physical Disk '%d' state is '%s'", $diskId, $diskState)); - if ($states{$diskState} ne 'OK'){ - $self->{output}->output_add(severity => $states{$diskState}, - short_msg => sprintf("Physical Disk '%d' state is '%s'.", $diskId, $diskState)); - } - } - } + $self->{output}->output_add(long_msg => sprintf("Physical Disk '%d' state is '%s'", $diskId, $diskState)); + if ($states{$diskState} ne 'OK'){ + $self->{output}->output_add(severity => $states{$diskState}, + short_msg => sprintf("Physical Disk '%d' state is '%s'.", $diskId, $diskState)); + } + } + } - $self->{output}->output_add(severity => 'OK', + $self->{output}->output_add(severity => 'OK', short_msg => sprintf("All %d physical disks are ok.", $total_components)); - + if (defined($self->{option_results}->{no_component}) && $total_components == 0) { $self->{output}->output_add(severity => $self->{no_components}, short_msg => 'No components are checked.'); @@ -167,6 +167,4 @@ If total (with skipped) is 0. (Default: 'critical' returns). =back -=cut - - +=cut \ No newline at end of file diff --git a/centreon-plugins/storage/hp/3par/7000/mode/psu.pm b/centreon-plugins/storage/hp/3par/7000/mode/psu.pm index ee3d04f0c..96418c82c 100644 --- a/centreon-plugins/storage/hp/3par/7000/mode/psu.pm +++ b/centreon-plugins/storage/hp/3par/7000/mode/psu.pm @@ -40,11 +40,11 @@ use base qw(centreon::plugins::mode); use strict; use warnings; -my %states = ( - 'ok' => 'OK', - 'new' => 'OK', - 'degraded' => 'WARNING', - 'failed' => 'CRITICAL', +my %states = ( + 'ok' => 'OK', + 'new' => 'OK', + 'degraded' => 'WARNING', + 'failed' => 'CRITICAL', ); sub new { @@ -55,7 +55,7 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname' }, + "hostname:s" => { name => 'hostname' }, "timeout:s" => { name => 'timeout', default => 30 }, "sudo" => { name => 'sudo' }, "ssh-option:s@" => { name => 'ssh_option' }, @@ -72,9 +72,9 @@ sub check_options { my ($self, %options) = @_; $self->SUPER::init(%options); - if (!defined($self->{option_results}->{hostname})) { - $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); - $self->{output}->option_exit(); + if (!defined($self->{option_results}->{hostname})) { + $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); + $self->{output}->option_exit(); } if (defined($self->{option_results}->{no_component})) { @@ -89,8 +89,8 @@ sub check_options { sub run { my ($self, %options) = @_; - $self->{option_results}->{remote} = 1; - my $stdout = centreon::plugins::misc::execute(output => $self->{output}, + $self->{option_results}->{remote} = 1; + my $stdout = centreon::plugins::misc::execute(output => $self->{output}, options => $self->{option_results}, sudo => $self->{option_results}->{sudo}, command => "shownode -ps", @@ -98,27 +98,27 @@ sub run { command_options => $self->{option_results}->{command_options}); - my $total_components = 0; - my @psus = split("\n",$stdout); - foreach my $psu (@psus) { - if ($psu =~ /\S+\s+(\d+)\s+\S+\s+\S+\s+(\S+)\s+(\S+)\s+(\S+)/) { - $total_components++; - my $psuId = $1; - my $ACState = $2; - my $DCState = $3; - my $psuState = $4; + my $total_components = 0; + my @psus = split("\n",$stdout); + foreach my $psu (@psus) { + if ($psu =~ /\S+\s+(\d+)\s+\S+\s+\S+\s+(\S+)\s+(\S+)\s+(\S+)/) { + $total_components++; + my $psuId = $1; + my $ACState = $2; + my $DCState = $3; + my $psuState = $4; - $self->{output}->output_add(long_msg => sprintf("Power Suppply '%d' state is '%s' [AC: %s] [DC: %s]", $psuId, $psuState, $ACState ,$DCState)); - if ($states{lc($psuState)} ne 'OK'){ - $self->{output}->output_add(severity => $states{lc($psuState)}, - short_msg => sprintf("Power Suppply '%d' state is '%s' [AC: %s] [DC: %s]", $psuId, $psuState, $ACState ,$DCState)); - } - } - } + $self->{output}->output_add(long_msg => sprintf("Power Suppply '%d' state is '%s' [AC: %s] [DC: %s]", $psuId, $psuState, $ACState ,$DCState)); + if ($states{lc($psuState)} ne 'OK'){ + $self->{output}->output_add(severity => $states{lc($psuState)}, + short_msg => sprintf("Power Suppply '%d' state is '%s' [AC: %s] [DC: %s]", $psuId, $psuState, $ACState ,$DCState)); + } + } + } - $self->{output}->output_add(severity => 'OK', + $self->{output}->output_add(severity => 'OK', short_msg => sprintf("All %d power supplies are ok.", $total_components)); - + if (defined($self->{option_results}->{no_component}) && $total_components == 0) { $self->{output}->output_add(severity => $self->{no_components}, short_msg => 'No components are checked.'); @@ -169,6 +169,4 @@ If total (with skipped) is 0. (Default: 'critical' returns). =back -=cut - - +=cut \ No newline at end of file diff --git a/centreon-plugins/storage/hp/3par/7000/mode/storage.pm b/centreon-plugins/storage/hp/3par/7000/mode/storage.pm index cbd95276b..81d4eace0 100644 --- a/centreon-plugins/storage/hp/3par/7000/mode/storage.pm +++ b/centreon-plugins/storage/hp/3par/7000/mode/storage.pm @@ -48,17 +48,17 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname' }, + "hostname:s" => { name => 'hostname' }, "timeout:s" => { name => 'timeout', default => 30 }, "sudo" => { name => 'sudo' }, "ssh-option:s@" => { name => 'ssh_option' }, "ssh-path:s" => { name => 'ssh_path' }, "ssh-command:s" => { name => 'ssh_command', default => 'ssh' }, - "warning:s" => { name => 'warning' }, - "critical:s" => { name => 'critical' }, - "filter-type:s" => { name => 'filter_type' }, - "disk:s" => { name => 'disk' }, - "regexp" => { name => 'regexp' }, + "warning:s" => { name => 'warning' }, + "critical:s" => { name => 'critical' }, + "filter-type:s" => { name => 'filter_type' }, + "disk:s" => { name => 'disk' }, + "regexp" => { name => 'regexp' }, }); $self->{components} = {}; $self->{no_components} = undef; @@ -69,17 +69,17 @@ sub check_options { my ($self, %options) = @_; $self->SUPER::init(%options); - if (!defined($self->{option_results}->{hostname})) { - $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); - $self->{output}->option_exit(); + if (!defined($self->{option_results}->{hostname})) { + $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); + $self->{output}->option_exit(); } - if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) { - $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'."); - $self->{output}->option_exit(); - } + if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'."); + $self->{output}->option_exit(); + } - if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) { + if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) { $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'."); $self->{output}->option_exit(); } @@ -88,8 +88,8 @@ sub check_options { sub run { my ($self, %options) = @_; - $self->{option_results}->{remote} = 1; - my $stdout = centreon::plugins::misc::execute(output => $self->{output}, + $self->{option_results}->{remote} = 1; + my $stdout = centreon::plugins::misc::execute(output => $self->{output}, options => $self->{option_results}, sudo => $self->{option_results}->{sudo}, command => "showpd", @@ -97,48 +97,48 @@ sub run { command_options => $self->{option_results}->{command_options}); - my $total_disks = 0; - my @disks = split("\n",$stdout); - foreach my $disk (@disks) { - if ($disk =~ /(\d+)\s+\S+\s+(\S+)\s+\d+\s+\S+\s+(\d+)\s+(\d+)\s+\S+\s+\S+\s+\d+/) { - $total_disks++; - my $diskId = $1; - my $diskType = $2; - my $diskSize = $3 * 1024 * 1024; - my $diskFree = $4 * 1024 * 1024; - my $diskUsed = $diskSize - $diskFree; - my $percentUsed = ($diskUsed / $diskSize) * 100; - my $percentFree = ($diskFree / $diskSize) * 100; + my $total_disks = 0; + my @disks = split("\n",$stdout); + foreach my $disk (@disks) { + if ($disk =~ /(\d+)\s+\S+\s+(\S+)\s+\d+\s+\S+\s+(\d+)\s+(\d+)\s+\S+\s+\S+\s+\d+/) { + $total_disks++; + my $diskId = $1; + my $diskType = $2; + my $diskSize = $3 * 1024 * 1024; + my $diskFree = $4 * 1024 * 1024; + my $diskUsed = $diskSize - $diskFree; + my $percentUsed = ($diskUsed / $diskSize) * 100; + my $percentFree = ($diskFree / $diskSize) * 100; - next if (defined($self->{option_results}->{filter_type}) && ($diskType !~ /$self->{option_results}->{filter_type}/i)); - next if (defined($self->{option_results}->{disk}) && defined($self->{option_results}->{regexp}) && ($diskId !~ /$self->{option_results}->{disk}/i)); - next if (defined($self->{option_results}->{disk}) && !defined($self->{option_results}->{regexp}) && ($diskId != $self->{option_results}->{disk})); + next if (defined($self->{option_results}->{filter_type}) && ($diskType !~ /$self->{option_results}->{filter_type}/i)); + next if (defined($self->{option_results}->{disk}) && defined($self->{option_results}->{regexp}) && ($diskId !~ /$self->{option_results}->{disk}/i)); + next if (defined($self->{option_results}->{disk}) && !defined($self->{option_results}->{regexp}) && ($diskId != $self->{option_results}->{disk})); - my ($diskSizeValue, $diskSizeUnit) = $self->{perfdata}->change_bytes(value => $diskSize); - my ($diskUsedValue, $diskUsedUnit) = $self->{perfdata}->change_bytes(value => $diskUsed); - my ($diskFreeValue, $diskFreeUnit) = $self->{perfdata}->change_bytes(value => $diskFree); + my ($diskSizeValue, $diskSizeUnit) = $self->{perfdata}->change_bytes(value => $diskSize); + my ($diskUsedValue, $diskUsedUnit) = $self->{perfdata}->change_bytes(value => $diskUsed); + my ($diskFreeValue, $diskFreeUnit) = $self->{perfdata}->change_bytes(value => $diskFree); - $self->{output}->output_add(long_msg => sprintf("Disk '%d' Total: %.2f%s Used: %.2f%s (%.2f%%) Free: %.2f%s (%.2f%%)", - $diskId, $diskSizeValue, $diskSizeUnit, $diskUsedValue, $diskUsedUnit, $percentUsed, $diskFreeValue, $diskFreeUnit, $percentFree)); - my $exit = $self->{perfdata}->threshold_check(value => $percentUsed, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); - if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { - $self->{output}->output_add(severity => $exit, - short_msg => sprintf("Disk '%d' Total: %.2f%s Used: %.2f%s (%.2f%%) Free: %.2f%s (%.2f%%)", - $diskId, $diskSizeValue, $diskSizeUnit, $diskUsedValue, $diskUsedUnit, $percentUsed, $diskFreeValue, $diskFreeUnit, $percentFree)); - } - $self->{output}->perfdata_add(label => 'disk_'.$diskId, - unit => 'B', - value => $diskUsed, - warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', total => $diskSize, cast_int => 1), - critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', total => $diskSize, cast_int => 1), - min => 0, - max => $diskSize); - } - } + $self->{output}->output_add(long_msg => sprintf("Disk '%d' Total: %.2f%s Used: %.2f%s (%.2f%%) Free: %.2f%s (%.2f%%)", + $diskId, $diskSizeValue, $diskSizeUnit, $diskUsedValue, $diskUsedUnit, $percentUsed, $diskFreeValue, $diskFreeUnit, $percentFree)); + my $exit = $self->{perfdata}->threshold_check(value => $percentUsed, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); + if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { + $self->{output}->output_add(severity => $exit, + short_msg => sprintf("Disk '%d' Total: %.2f%s Used: %.2f%s (%.2f%%) Free: %.2f%s (%.2f%%)", + $diskId, $diskSizeValue, $diskSizeUnit, $diskUsedValue, $diskUsedUnit, $percentUsed, $diskFreeValue, $diskFreeUnit, $percentFree)); + } + $self->{output}->perfdata_add(label => 'disk_'.$diskId, + unit => 'B', + value => $diskUsed, + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', total => $diskSize, cast_int => 1), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', total => $diskSize, cast_int => 1), + min => 0, + max => $diskSize); + } + } - $self->{output}->output_add(severity => 'OK', + $self->{output}->output_add(severity => 'OK', short_msg => 'All disks are ok.'); - + $self->{output}->display(); $self->{output}->exit(); } @@ -184,6 +184,4 @@ If total (with skipped) is 0. (Default: 'critical' returns). =back -=cut - - +=cut \ No newline at end of file diff --git a/centreon-plugins/storage/hp/3par/7000/mode/temperature.pm b/centreon-plugins/storage/hp/3par/7000/mode/temperature.pm index a8dc9af29..5a2589a93 100644 --- a/centreon-plugins/storage/hp/3par/7000/mode/temperature.pm +++ b/centreon-plugins/storage/hp/3par/7000/mode/temperature.pm @@ -49,15 +49,15 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname' }, + "hostname:s" => { name => 'hostname' }, "timeout:s" => { name => 'timeout', default => 30 }, "sudo" => { name => 'sudo' }, "ssh-option:s@" => { name => 'ssh_option' }, "ssh-path:s" => { name => 'ssh_path' }, "ssh-command:s" => { name => 'ssh_command', default => 'ssh' }, "no-component:s" => { name => 'no_component' }, - "sensor:s" => { name => 'sensor' }, - "regexp" => { name => 'regexp' }, + "sensor:s" => { name => 'sensor' }, + "regexp" => { name => 'regexp' }, }); $self->{components} = {}; $self->{no_components} = undef; @@ -68,7 +68,7 @@ sub check_options { my ($self, %options) = @_; $self->SUPER::init(%options); - if (!defined($self->{option_results}->{hostname})) { + if (!defined($self->{option_results}->{hostname})) { $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); $self->{output}->option_exit(); } @@ -85,8 +85,8 @@ sub check_options { sub run { my ($self, %options) = @_; - $self->{option_results}->{remote} = 1; - my $stdout = centreon::plugins::misc::execute(output => $self->{output}, + $self->{option_results}->{remote} = 1; + my $stdout = centreon::plugins::misc::execute(output => $self->{output}, options => $self->{option_results}, sudo => $self->{option_results}->{sudo}, command => "shownodeenv", @@ -94,39 +94,39 @@ sub run { command_options => $self->{option_results}->{command_options}); - my $total_components = 0; - my $nodeID = 0; - my @temperatures = split(/\n/,$stdout); - foreach my $temperature (@temperatures) { - if ($temperature =~ /^Node\s(\d+)$/) { - $nodeID = $1; - } - if ($temperature =~ /^(.+)\s(\d+)\sC\s+(\d+)\sC\s+(\d+)/) { - my $measurement = $1; - my $readTemp = $2; - my $loTemp = $3; - my $hiTemp= $4; - $measurement =~ s/^\s+//; - $measurement =~ s/\s+$//; - $total_components++; + my $total_components = 0; + my $nodeID = 0; + my @temperatures = split(/\n/,$stdout); + foreach my $temperature (@temperatures) { + if ($temperature =~ /^Node\s(\d+)$/) { + $nodeID = $1; + } + if ($temperature =~ /^(.+)\s(\d+)\sC\s+(\d+)\sC\s+(\d+)/) { + my $measurement = $1; + my $readTemp = $2; + my $loTemp = $3; + my $hiTemp= $4; + $measurement =~ s/^\s+//; + $measurement =~ s/\s+$//; + $total_components++; - next if (defined($self->{option_results}->{sensor}) && defined($self->{option_results}->{regexp}) && ($measurement !~ /$self->{option_results}->{sensor}/i)); - next if (defined($self->{option_results}->{sensor}) && !defined($self->{option_results}->{regexp}) && ($measurement != $self->{option_results}->{sensor})); - + next if (defined($self->{option_results}->{sensor}) && defined($self->{option_results}->{regexp}) && ($measurement !~ /$self->{option_results}->{sensor}/i)); + next if (defined($self->{option_results}->{sensor}) && !defined($self->{option_results}->{regexp}) && ($measurement != $self->{option_results}->{sensor})); + $self->{output}->output_add(long_msg => sprintf("Temperature '%s' on node '%d' is '%dC' [Max temperature: '%dC'] [Min temperature: '%dC'", $measurement, $nodeID, $readTemp, $hiTemp, $loTemp)); - if (($readTemp > $hiTemp) || ($readTemp < $loTemp)){ - $self->{output}->output_add(severity => 'critical', - short_msg => sprintf("Temperature '%s' on node '%d' is '%dC' [Max temperature: '%dC'] [Min temperature: '%dC'", $measurement, $nodeID, $readTemp, $hiTemp, $loTemp)); - } - $self->{output}->perfdata_add(label => $measurement.'_temperature', - unit => 'C', - value => $readTemp); - } - } + if (($readTemp > $hiTemp) || ($readTemp < $loTemp)){ + $self->{output}->output_add(severity => 'critical', + short_msg => sprintf("Temperature '%s' on node '%d' is '%dC' [Max temperature: '%dC'] [Min temperature: '%dC'", $measurement, $nodeID, $readTemp, $hiTemp, $loTemp)); + } + $self->{output}->perfdata_add(label => $measurement.'_temperature', + unit => 'C', + value => $readTemp); + } + } - $self->{output}->output_add(severity => 'OK', + $self->{output}->output_add(severity => 'OK', short_msg => sprintf("All %d temperatures are ok.", $total_components)); - + if (defined($self->{option_results}->{no_component}) && $total_components == 0) { $self->{output}->output_add(severity => $self->{no_components}, short_msg => 'No components are checked.'); diff --git a/centreon-plugins/storage/hp/3par/7000/mode/volume.pm b/centreon-plugins/storage/hp/3par/7000/mode/volume.pm index 195f425bc..6ab66025d 100644 --- a/centreon-plugins/storage/hp/3par/7000/mode/volume.pm +++ b/centreon-plugins/storage/hp/3par/7000/mode/volume.pm @@ -48,18 +48,18 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname' }, + "hostname:s" => { name => 'hostname' }, "timeout:s" => { name => 'timeout', default => 30 }, "sudo" => { name => 'sudo' }, "ssh-option:s@" => { name => 'ssh_option' }, "ssh-path:s" => { name => 'ssh_path' }, "ssh-command:s" => { name => 'ssh_command', default => 'ssh' }, - "warning:s" => { name => 'warning' }, - "critical:s" => { name => 'critical' }, - "filter-type:s" => { name => 'filter_type' }, - "volume:s" => { name => 'volume' }, - "name" => { name => 'name' }, - "regexp" => { name => 'regexp' }, + "warning:s" => { name => 'warning' }, + "critical:s" => { name => 'critical' }, + "filter-type:s" => { name => 'filter_type' }, + "volume:s" => { name => 'volume' }, + "name" => { name => 'name' }, + "regexp" => { name => 'regexp' }, }); $self->{components} = {}; $self->{no_components} = undef; @@ -70,17 +70,17 @@ sub check_options { my ($self, %options) = @_; $self->SUPER::init(%options); - if (!defined($self->{option_results}->{hostname})) { - $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); - $self->{output}->option_exit(); + if (!defined($self->{option_results}->{hostname})) { + $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); + $self->{output}->option_exit(); } - if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) { - $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'."); - $self->{output}->option_exit(); - } + if (($self->{perfdata}->threshold_validate(label => 'warning', value => $self->{option_results}->{warning})) == 0) { + $self->{output}->add_option_msg(short_msg => "Wrong warning threshold '" . $self->{option_results}->{warning} . "'."); + $self->{output}->option_exit(); + } - if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) { + if (($self->{perfdata}->threshold_validate(label => 'critical', value => $self->{option_results}->{critical})) == 0) { $self->{output}->add_option_msg(short_msg => "Wrong critical threshold '" . $self->{option_results}->{critical} . "'."); $self->{output}->option_exit(); } @@ -89,8 +89,8 @@ sub check_options { sub run { my ($self, %options) = @_; - $self->{option_results}->{remote} = 1; - my $stdout = centreon::plugins::misc::execute(output => $self->{output}, + $self->{option_results}->{remote} = 1; + my $stdout = centreon::plugins::misc::execute(output => $self->{output}, options => $self->{option_results}, sudo => $self->{option_results}->{sudo}, command => "showvv -showcols Id,Name,VSize_MB,Snp_Rsvd_MB,Snp_Used_MB,Adm_Rsvd_MB,Adm_Used_MB,Usr_Rsvd_MB,Usr_Used_MB", @@ -98,74 +98,74 @@ sub run { command_options => $self->{option_results}->{command_options}); - my $total_volumes = 0; - my @volumes = split("\n",$stdout); - foreach my $volume (@volumes) { - if ($volume =~ /(\d+)\s+(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/) { - $total_volumes++; - my $volumeId = $1; - my $volumeName = $2; - my $volumeSize = $3 * 1024 * 1024; - my $volumeSnpSize = $4 * 1024 * 1024; + my $total_volumes = 0; + my @volumes = split("\n",$stdout); + foreach my $volume (@volumes) { + if ($volume =~ /(\d+)\s+(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/) { + $total_volumes++; + my $volumeId = $1; + my $volumeName = $2; + my $volumeSize = $3 * 1024 * 1024; + my $volumeSnpSize = $4 * 1024 * 1024; my $volumeSnpUsed = $5 * 1024 * 1024; - my $volumeAdmSize = $6 * 1024 * 1024; - my $volumeAdmUsed = $7 * 1024 * 1024; - my $volumeUsrSize = $8 * 1024 * 1024; - my $volumeUsrUsed = $9 * 1024 * 1024; - my $volumeUsed = $volumeSnpUsed + $volumeAdmUsed + $volumeUsrUsed; - my $volumeFree = $volumeSize - $volumeUsed; - my $percentUsed = ($volumeUsed / $volumeSize) * 100; - my $percentFree = 100 - $percentUsed; + my $volumeAdmSize = $6 * 1024 * 1024; + my $volumeAdmUsed = $7 * 1024 * 1024; + my $volumeUsrSize = $8 * 1024 * 1024; + my $volumeUsrUsed = $9 * 1024 * 1024; + my $volumeUsed = $volumeSnpUsed + $volumeAdmUsed + $volumeUsrUsed; + my $volumeFree = $volumeSize - $volumeUsed; + my $percentUsed = ($volumeUsed / $volumeSize) * 100; + my $percentFree = 100 - $percentUsed; - my $string_to_compare = $volumeId; - if (defined($self->{option_results}->{name})) { - $string_to_compare = $volumeName; - } + my $string_to_compare = $volumeId; + if (defined($self->{option_results}->{name})) { + $string_to_compare = $volumeName; + } - next if (defined($self->{option_results}->{volume}) && defined($self->{option_results}->{regexp}) && ($string_to_compare !~ /$self->{option_results}->{volume}/i)); - next if (defined($self->{option_results}->{volume}) && !defined($self->{option_results}->{regexp}) && ($string_to_compare ne $self->{option_results}->{volume})); + next if (defined($self->{option_results}->{volume}) && defined($self->{option_results}->{regexp}) && ($string_to_compare !~ /$self->{option_results}->{volume}/i)); + next if (defined($self->{option_results}->{volume}) && !defined($self->{option_results}->{regexp}) && ($string_to_compare ne $self->{option_results}->{volume})); - my ($volumeSizeValue, $volumeSizeUnit) = $self->{perfdata}->change_bytes(value => $volumeSize); - my ($volumeUsedValue, $volumeUsedUnit) = $self->{perfdata}->change_bytes(value => $volumeUsed); - my ($volumeFreeValue, $volumeFreeUnit) = $self->{perfdata}->change_bytes(value => $volumeFree); - my ($volumeSnpSizeValue, $volumeSnpSizeUnit) = $self->{perfdata}->change_bytes(value => $volumeSnpSize); - my ($volumeSnpUsedValue, $volumeSnpUsedUnit) = $self->{perfdata}->change_bytes(value => $volumeSnpUsed); - my ($volumeAdmSizeValue, $volumeAdmSizeUnit) = $self->{perfdata}->change_bytes(value => $volumeAdmSize); + my ($volumeSizeValue, $volumeSizeUnit) = $self->{perfdata}->change_bytes(value => $volumeSize); + my ($volumeUsedValue, $volumeUsedUnit) = $self->{perfdata}->change_bytes(value => $volumeUsed); + my ($volumeFreeValue, $volumeFreeUnit) = $self->{perfdata}->change_bytes(value => $volumeFree); + my ($volumeSnpSizeValue, $volumeSnpSizeUnit) = $self->{perfdata}->change_bytes(value => $volumeSnpSize); + my ($volumeSnpUsedValue, $volumeSnpUsedUnit) = $self->{perfdata}->change_bytes(value => $volumeSnpUsed); + my ($volumeAdmSizeValue, $volumeAdmSizeUnit) = $self->{perfdata}->change_bytes(value => $volumeAdmSize); my ($volumeAdmUsedValue, $volumeAdmUsedUnit) = $self->{perfdata}->change_bytes(value => $volumeAdmUsed); - my ($volumeUsrSizeValue, $volumeUsrSizeUnit) = $self->{perfdata}->change_bytes(value => $volumeUsrSize); + my ($volumeUsrSizeValue, $volumeUsrSizeUnit) = $self->{perfdata}->change_bytes(value => $volumeUsrSize); my ($volumeUsrUsedValue, $volumeUsrUsedUnit) = $self->{perfdata}->change_bytes(value => $volumeUsrUsed); - $self->{output}->output_add(long_msg => sprintf("Volume %d '%s' Total: %.2f%s Used: %.2f%s (%.2f%%) Free: %.2f%s (%.2f%%) Usr: %.2f%s Adm: %.2f%s Snp: %.2f%s", - $volumeId, $volumeName, $volumeSizeValue, $volumeSizeUnit, - $volumeUsedValue, $volumeUsedUnit, $percentUsed, - $volumeFreeValue, $volumeFreeUnit, $percentFree, - $volumeUsrUsedValue, $volumeUsrUsedUnit, - $volumeAdmUsedValue, $volumeAdmUsedUnit, - $volumeSnpUsedValue, $volumeSnpUsedUnit,)); - my $exit = $self->{perfdata}->threshold_check(value => $percentUsed, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); - if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { - $self->{output}->output_add(severity => $exit, - short_msg => sprintf("Volume %d '%s' Total: %.2f%s Used: %.2f%s (%.2f%%) Free: %.2f%s (%.2f%%) Usr: %.2f%s Adm: %.2f%s Snp: %.2f%s", + $self->{output}->output_add(long_msg => sprintf("Volume %d '%s' Total: %.2f%s Used: %.2f%s (%.2f%%) Free: %.2f%s (%.2f%%) Usr: %.2f%s Adm: %.2f%s Snp: %.2f%s", $volumeId, $volumeName, $volumeSizeValue, $volumeSizeUnit, $volumeUsedValue, $volumeUsedUnit, $percentUsed, $volumeFreeValue, $volumeFreeUnit, $percentFree, $volumeUsrUsedValue, $volumeUsrUsedUnit, $volumeAdmUsedValue, $volumeAdmUsedUnit, $volumeSnpUsedValue, $volumeSnpUsedUnit,)); - } - $self->{output}->perfdata_add(label => 'volume_'.$volumeName, - unit => 'B', - value => $volumeUsed, - warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', total => $volumeSize, cast_int => 1), - critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', total => $volumeSize, cast_int => 1), - min => 0, - max => $volumeSize); - } - } + my $exit = $self->{perfdata}->threshold_check(value => $percentUsed, threshold => [ { label => 'critical', 'exit_litteral' => 'critical' }, { label => 'warning', exit_litteral => 'warning' } ]); + if (!$self->{output}->is_status(value => $exit, compare => 'ok', litteral => 1)) { + $self->{output}->output_add(severity => $exit, + short_msg => sprintf("Volume %d '%s' Total: %.2f%s Used: %.2f%s (%.2f%%) Free: %.2f%s (%.2f%%) Usr: %.2f%s Adm: %.2f%s Snp: %.2f%s", + $volumeId, $volumeName, $volumeSizeValue, $volumeSizeUnit, + $volumeUsedValue, $volumeUsedUnit, $percentUsed, + $volumeFreeValue, $volumeFreeUnit, $percentFree, + $volumeUsrUsedValue, $volumeUsrUsedUnit, + $volumeAdmUsedValue, $volumeAdmUsedUnit, + $volumeSnpUsedValue, $volumeSnpUsedUnit,)); + } + $self->{output}->perfdata_add(label => 'volume_'.$volumeName, + unit => 'B', + value => $volumeUsed, + warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning', total => $volumeSize, cast_int => 1), + critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical', total => $volumeSize, cast_int => 1), + min => 0, + max => $volumeSize); + } + } - $self->{output}->output_add(severity => 'OK', + $self->{output}->output_add(severity => 'OK', short_msg => 'All volumes are ok.'); - + $self->{output}->display(); $self->{output}->exit(); } diff --git a/centreon-plugins/storage/hp/3par/7000/mode/wsapi.pm b/centreon-plugins/storage/hp/3par/7000/mode/wsapi.pm index 8fb605385..0d5ce44e0 100644 --- a/centreon-plugins/storage/hp/3par/7000/mode/wsapi.pm +++ b/centreon-plugins/storage/hp/3par/7000/mode/wsapi.pm @@ -48,13 +48,13 @@ sub new { $self->{version} = '1.0'; $options{options}->add_options(arguments => { - "hostname:s" => { name => 'hostname' }, + "hostname:s" => { name => 'hostname' }, "timeout:s" => { name => 'timeout', default => 30 }, "sudo" => { name => 'sudo' }, "ssh-option:s@" => { name => 'ssh_option' }, "ssh-path:s" => { name => 'ssh_path' }, "ssh-command:s" => { name => 'ssh_command', default => 'ssh' }, - "no-wsapi:s" => { name => 'no_wsapi' }, + "no-wsapi:s" => { name => 'no_wsapi' }, }); $self->{no_wsapi} = undef; return $self; @@ -64,9 +64,9 @@ sub check_options { my ($self, %options) = @_; $self->SUPER::init(%options); - if (!defined($self->{option_results}->{hostname})) { - $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); - $self->{output}->option_exit(); + if (!defined($self->{option_results}->{hostname})) { + $self->{output}->add_option_msg(short_msg => "Need to specify a hostname."); + $self->{output}->option_exit(); } if (defined($self->{option_results}->{no_wsapi})) { @@ -81,8 +81,8 @@ sub check_options { sub run { my ($self, %options) = @_; - $self->{option_results}->{remote} = 1; - my $stdout = centreon::plugins::misc::execute(output => $self->{output}, + $self->{option_results}->{remote} = 1; + my $stdout = centreon::plugins::misc::execute(output => $self->{output}, options => $self->{option_results}, sudo => $self->{option_results}->{sudo}, command => "showwsapi", @@ -90,32 +90,32 @@ sub run { command_options => $self->{option_results}->{command_options}); - my @results = split("\n",$stdout); - my $total_wsapi = 0; - foreach my $result (@results) { - if ($result =~ /(\S+)\s+(\S+)\s+(\S+)\s+(\d+)\s+(\S+)\s+(\d+)\s+\S+/) { - $total_wsapi++; - my $serviceStatus = $1; - my $serviceState = $2; - my $httpState = $3; - my $httpPort = $4; - my $httpsState = $5; + my @results = split("\n",$stdout); + my $total_wsapi = 0; + foreach my $result (@results) { + if ($result =~ /(\S+)\s+(\S+)\s+(\S+)\s+(\d+)\s+(\S+)\s+(\d+)\s+\S+/) { + $total_wsapi++; + my $serviceStatus = $1; + my $serviceState = $2; + my $httpState = $3; + my $httpPort = $4; + my $httpsState = $5; my $httpsPort = $6; - $self->{output}->output_add(long_msg => sprintf("WSAPI service is '%s' and '%s' [HTTP on port %d is %s] [HTTPS on port %d is %s]", - $serviceStatus, $serviceState, $httpPort, $httpState, $httpsPort ,$httpsState)); - if ((lc($serviceStatus) ne 'enabled') || (lc($serviceState) ne 'active')){ - $self->{output}->output_add(severity => 'critical', - short_msg => sprintf("WSAPI service is '%s' and '%s' [HTTP on port %d is %s] [HTTPS on port %d is %s]", + $self->{output}->output_add(long_msg => sprintf("WSAPI service is '%s' and '%s' [HTTP on port %d is %s] [HTTPS on port %d is %s]", $serviceStatus, $serviceState, $httpPort, $httpState, $httpsPort ,$httpsState)); - } - } - } + if ((lc($serviceStatus) ne 'enabled') || (lc($serviceState) ne 'active')){ + $self->{output}->output_add(severity => 'critical', + short_msg => sprintf("WSAPI service is '%s' and '%s' [HTTP on port %d is %s] [HTTPS on port %d is %s]", + $serviceStatus, $serviceState, $httpPort, $httpState, $httpsPort ,$httpsState)); + } + } + } - $self->{output}->output_add(severity => 'OK', + $self->{output}->output_add(severity => 'OK', short_msg => 'WSAPI service is ok.'); - - if (defined($self->{option_results}->{no_wsapi}) && $total_wsapi == 0) { + + if (defined($self->{option_results}->{no_wsapi}) && $total_wsapi == 0) { $self->{output}->output_add(severity => $self->{no_wsapi}, short_msg => 'No WSAPI service is checked.'); } @@ -165,6 +165,4 @@ If total (with skipped) is 0. (Default: 'critical' returns). =back -=cut - - +=cut \ No newline at end of file diff --git a/centreon-plugins/storage/hp/3par/7000/plugin.pm b/centreon-plugins/storage/hp/3par/7000/plugin.pm index d967edddf..e711922db 100644 --- a/centreon-plugins/storage/hp/3par/7000/plugin.pm +++ b/centreon-plugins/storage/hp/3par/7000/plugin.pm @@ -48,15 +48,15 @@ sub new { $self->{version} = '1.0'; %{$self->{modes}} = ( 'physicaldisk' => 'storage::hp::3par::7000::mode::physicaldisk', - 'psu' => 'storage::hp::3par::7000::mode::psu', + 'psu' => 'storage::hp::3par::7000::mode::psu', 'node' => 'storage::hp::3par::7000::mode::node', - 'battery' => 'storage::hp::3par::7000::mode::battery', - 'wsapi' => 'storage::hp::3par::7000::mode::wsapi', - 'cim' => 'storage::hp::3par::7000::mode::cim', - 'temperature' => 'storage::hp::3par::7000::mode::temperature', - 'storage' => 'storage::hp::3par::7000::mode::storage', - 'iscsi' => 'storage::hp::3par::7000::mode::iscsi', - 'volume' => 'storage::hp::3par::7000::mode::volume', + 'battery' => 'storage::hp::3par::7000::mode::battery', + 'wsapi' => 'storage::hp::3par::7000::mode::wsapi', + 'cim' => 'storage::hp::3par::7000::mode::cim', + 'temperature' => 'storage::hp::3par::7000::mode::temperature', + 'storage' => 'storage::hp::3par::7000::mode::storage', + 'iscsi' => 'storage::hp::3par::7000::mode::iscsi', + 'volume' => 'storage::hp::3par::7000::mode::volume', ); return $self;