X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-hpasm;h=83f2ae68a8d7367dae2ba59c7635f60876ad6f95;hb=a540681e958792830902b62a774aa98fbc3c97c1;hp=029fc018923c0e1fdef31d0a9138b816dd2dbcf4;hpb=36e46c0037fcb92d0cad170e0a17f4eddc732026;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-hpasm b/dsa-nagios-checks/checks/dsa-check-hpasm
index 029fc01..83f2ae6 100755
--- a/dsa-nagios-checks/checks/dsa-check-hpasm
+++ b/dsa-nagios-checks/checks/dsa-check-hpasm
@@ -2,6 +2,8 @@
 
 use strict;
 use warnings;
+use English;
+use Getopt::Long;
 
 # check status of various hardware devices (fans, temp, dimms, powersupply)
 # requires hpasmcli
@@ -42,6 +44,26 @@ my %callbacks = (
   'SHOW TEMP'        => \&do_temp,
 );
 
+
+my $params = {};
+
+my $USAGE = "PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant] [--fan-no-redundant] [--fan-high]\n";
+Getopt::Long::config('bundling');
+if (!GetOptions (
+        '--help'                => \$params->{'help'},
+        '--ps-no-redundant'     => \$params->{'ps-no-redundant'},
+        '--fan-no-redundant'    => \$params->{'fan-no-redundant'},
+        '--fan-high'            => \$params->{'fan-high'},
+        )) {
+        die ("$USAGE");
+};
+if ($params->{'help'}) {
+        print "$USAGE";
+        print "Checks hp hardware health.\n";
+        exit (0);
+};
+
+
 my $prompt = "hpasmcli>";
 my $exit_status = 0;
 my $ret = '';
@@ -122,10 +144,10 @@ sub do_fans {
         $exit_status |= 2;
       } elsif ($line[3] ne 'NORMAL') {
         $message = sprintf("FAN%d: speed=%s ", $fan_num, $line[3]);
-        $exit_status |= 1;
+        $exit_status |= 1 unless ($line[3] eq 'HIGH' && $params->{'fan-high'});
       } elsif ($line[5] ne 'Yes') {
         $message = sprintf("FAN%d: redundant=%s ",$fan_num, $line[5]);
-        $exit_status |= 1;
+        $exit_status |= 1 unless ($params->{'fan-no-redundant'});
       }
     } elsif ($line =~ /($prompt|^\s*$)/) {
       last;
@@ -176,7 +198,7 @@ sub do_powersupply {
       my $redundant = $1;
       if ($redundant ne 'Yes') {
         $message = sprintf("PS%d not redundant ", $ps_num);
-        $exit_status |= 1;
+        $exit_status |= 1 unless ($params->{'ps-no-redundant'});
       }
     } elsif ($line =~ /($prompt|^\s*$)/) {
       last;
@@ -222,8 +244,8 @@ sub do_temp {
       next if ($threshold eq '-');
       $num_temp++;
 
-      my $off = $threshold - $current_temp;
       if ($current_temp ne '-') {
+        my $off = $threshold - $current_temp;
         if ($off <= 0) {
           $message = sprintf("TEMP zone=%s %sC/%sC ", $zone, $current_temp, $threshold);
           $exit_status |= 2;