X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-hpasm;fp=dsa-nagios-checks%2Fchecks%2Fdsa-check-hpasm;h=83f2ae68a8d7367dae2ba59c7635f60876ad6f95;hb=65f5eda071333458bccafc11ff63e697fd19ac9d;hp=0d46c642369502b2ebfddd5b98aa985d5ef31fd8;hpb=2da96e4ba4fc735aaf73991d9ec299ab2648ce6f;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-hpasm b/dsa-nagios-checks/checks/dsa-check-hpasm
index 0d46c64..83f2ae6 100755
--- a/dsa-nagios-checks/checks/dsa-check-hpasm
+++ b/dsa-nagios-checks/checks/dsa-check-hpasm
@@ -47,16 +47,18 @@ my %callbacks = (
 
 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 ("$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant] [--fan-no-redundant]\n");
+        die ("$USAGE");
 };
 if ($params->{'help'}) {
-        print "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant] [--fan-no-redundant]\n";
+        print "$USAGE";
         print "Checks hp hardware health.\n";
         exit (0);
 };
@@ -142,7 +144,7 @@ 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 unless ($params->{'fan-no-redundant'});