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

dsa-check-hpasm: Support a --ps-no-redundant option.  If supplied then non-redundant power supply 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 0f008e1..ee5ec8b 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,23 @@ my %callbacks = (
   'SHOW TEMP'        => \&do_temp,
 );
 
+
+my $params = {};
+
+Getopt::Long::config('bundling');
+if (!GetOptions (
+        '--help'                => \$params->{'help'},
+        '--ps-no-redundant'     => \$params->{'ps-no-redundant'},
+        )) {
+        die ("$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant]\n");
+};
+if ($params->{'help'}) {
+        print "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant]\n";
+        print "Checks hp hardware health.\n";
+        exit (0);
+};
+
+
 my $prompt = "hpasmcli>";
 my $exit_status = 0;
 my $ret = '';
@@ -176,7 +195,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;
diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 15a7017..45139c7 100644
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -1,10 +1,12 @@
-dsa-nagios-checks (85) unstable; urgency=low
+dsa-nagios-checks (8x) unstable; urgency=low
 
   * dsa-check-hpasm: Not all things where a temperature can be measured
     might be installed (e.g. a second CPU).  Don't do numeric computations
     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.
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 09 Dec 2009 17:05:42 +0100
+ -- Peter Palfrader <weasel@debian.org>  Thu, 10 Dec 2009 15:13:33 +0100
 
 dsa-nagios-checks (84) unstable; urgency=low