From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 10 Dec 2009 14:20:58 +0000 (+0100)
Subject: dsa-check-hpasm: Support a --fan-no-redundant option.  If supplied then non-redundant... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c549b8289f921fec44fa543e96f7f106746af948;p=mirror%2Fdsa-nagios.git

dsa-check-hpasm: Support a --fan-no-redundant option.  If supplied then non-redundant fans will not be a warning state.
---

diff --git a/dsa-nagios-checks/checks/dsa-check-hpasm b/dsa-nagios-checks/checks/dsa-check-hpasm
index ee5ec8b..0d46c64 100755
--- a/dsa-nagios-checks/checks/dsa-check-hpasm
+++ b/dsa-nagios-checks/checks/dsa-check-hpasm
@@ -51,11 +51,12 @@ Getopt::Long::config('bundling');
 if (!GetOptions (
         '--help'                => \$params->{'help'},
         '--ps-no-redundant'     => \$params->{'ps-no-redundant'},
+        '--fan-no-redundant'    => \$params->{'fan-no-redundant'},
         )) {
-        die ("$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant]\n");
+        die ("$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant] [--fan-no-redundant]\n");
 };
 if ($params->{'help'}) {
-        print "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant]\n";
+        print "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant] [--fan-no-redundant]\n";
         print "Checks hp hardware health.\n";
         exit (0);
 };
@@ -144,7 +145,7 @@ sub do_fans {
         $exit_status |= 1;
       } 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;
diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 45139c7..68ca632 100644
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -5,8 +5,10 @@ dsa-nagios-checks (8x) unstable; urgency=low
     on a "-" instead of numbers then.
   * dsa-check-hpasm: Support a --ps-no-redundant option.  If supplied
     then non-redundant power supply will not be a warning state.
+  * dsa-check-hpasm: Support a --fan-no-redundant option.  If supplied
+    then non-redundant fans will not be a warning state.
 
- -- Peter Palfrader <weasel@debian.org>  Thu, 10 Dec 2009 15:13:33 +0100
+ -- Peter Palfrader <weasel@debian.org>  Thu, 10 Dec 2009 15:20:41 +0100
 
 dsa-nagios-checks (84) unstable; urgency=low