dsa-check-hpasm: Incorporate patch from Jan Wagner to ignore fan lines that do not...

diff --git a/dsa-nagios-checks/checks/dsa-check-hpasm b/dsa-nagios-checks/checks/dsa-check-hpasm
index fc98866..8d3339e 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-hpasm
+++ b/dsa-nagios-checks/checks/dsa-check-hpasm
@@ -47,14 +47,15 @@ my %callbacks = (
 
 my $params = {};
 
-my $USAGE = "PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant] [--fan-no-redundant] [--fan-high] [--dimm-na]\n";
+my $USAGE = "PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant] [--fan-no-redundant] [--fan-high] [--dimm-na] [--fan-ignore-not-present]\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'},
-        '--dimm-na'             => \$params->{'dimm-na'},
+        '--help'                        => \$params->{'help'},
+        '--ps-no-redundant'             => \$params->{'ps-no-redundant'},
+        '--fan-no-redundant'            => \$params->{'fan-no-redundant'},
+        '--fan-high'                    => \$params->{'fan-high'},
+        '--dimm-na'                     => \$params->{'dimm-na'},
+        '--fan-ignore-not-present'      => \$params->{'fan-ignore-not-present'},
         )) {
         die ("$USAGE");
 };
@@ -143,7 +144,7 @@ sub do_fans {
 
       if ($line[2] ne 'Yes') {
         $message = sprintf("FAN%d: status=%s ", $fan_num, $line[2]);
-        $exit_status |= 2;
+        $exit_status |= 2 unless ($params->{'fan-ignore-not-present'});
       } elsif ($line[3] ne 'NORMAL') {
         $message = sprintf("FAN%d: speed=%s ", $fan_num, $line[3]);
         $exit_status |= 1 unless ($line[3] eq 'HIGH' && $params->{'fan-high'});

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 0559f57..5cb29c8 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -14,10 +14,12 @@ dsa-nagios-checks (8x) xnstable; urgency=low
   * dsa-check-hpacucli: accept 6.0Gbps for SAS disks.
   * dsa-check-hpasm: Incorporate patch from Jan Wagner to ignore "N/A" DIMM
     status.
+  * dsa-check-hpasm: Incorporate patch from Jan Wagner to ignore fan lines
+    that do not say 'Yes' in the present-line.
   * dsa-check-udldap-freshness: Also check age of /var/lib/misc/passwd.db
     in addition to /var/lib/misc/thishost/passwd.tdb.
 
- -- Peter Palfrader <weasel@debian.org>  Mon, 06 Dec 2010 14:41:38 +0100
+ -- Peter Palfrader <weasel@debian.org>  Wed, 08 Dec 2010 15:39:33 +0100
 
 dsa-nagios-checks (87) unstable; urgency=low