dsa-check-hpasm: Add --fan-high to not tread high fan speeds as a warning condition

diff --git a/dsa-nagios-checks/checks/dsa-check-hpasm b/dsa-nagios-checks/checks/dsa-check-hpasm
index 0d46c64..83f2ae6 100755 (executable)
--- 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'});

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 1b1cbbf..aef644d 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -22,8 +22,10 @@ dsa-nagios-checks (8x) unstable; urgency=low
   * dsa-check-dabackup-server: check /etc/ssh/userkeys/root instead of
     /root/.ssh/authorized_keys.
   * add dsa-check-dnssec-delegation.
+  * dsa-check-hpasm: Add --fan-high to not tread high fan speeds as a
+    warning condition.
 
- -- Peter Palfrader <weasel@debian.org>  Wed, 17 Feb 2010 14:59:25 +0100
+ -- Peter Palfrader <weasel@debian.org>  Sat, 20 Feb 2010 09:44:13 +0100
 
 dsa-nagios-checks (84) unstable; urgency=low