From fc44623635620fb4ee128a81db1ef4f9d4b0dd61 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 19 Dec 2012 14:44:11 +0100
Subject: [PATCH] dsa-check-hpacucli: Add --no-battery to ignore
 battery/capacitor failures and disabled caches.

---
 dsa-nagios-checks/checks/dsa-check-hpacucli | 5 ++++-
 dsa-nagios-checks/debian/changelog          | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dsa-nagios-checks/checks/dsa-check-hpacucli b/dsa-nagios-checks/checks/dsa-check-hpacucli
index ea8b012..55d8ce7 100755
--- a/dsa-nagios-checks/checks/dsa-check-hpacucli
+++ b/dsa-nagios-checks/checks/dsa-check-hpacucli
@@ -64,11 +64,12 @@ sub record($) {
 	};
 }
 
-my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--ignore-transfer-speed=<pd> [--ignore-transfer-speed=<pd> ...]]\n";
+my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--no-battery] [--ignore-transfer-speed=<pd> [--ignore-transfer-speed=<pd> ...]]\n";
 my $params;
 Getopt::Long::Configure('bundling');
 if (!GetOptions (
 	'--help'                      => \$params->{'help'},
+	'--no-battery'                => \$params->{'no-battery'},
 	'--ignore-transfer-speed=s@'  => \$params->{'ignore-transfer-speed'},
 	)) {
 	die ($usage);
@@ -236,6 +237,8 @@ for my $slot (sort @controllers) {
 			my $status = $2;
 			push @{$status{$status}}, $system;
 			if ($status ne 'OK') {
+				next if ($params->{'no-battery'} && $system eq 'Cache');
+				next if ($params->{'no-battery'} && $system eq 'Battery/Capacitor');
 				record('WARNING');
 			};
 		} else {
diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 3537ef1..b363746 100644
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -17,6 +17,8 @@ dsa-nagios-checks (9X) Xnstable; urgency=low
     packages, but it makes things work again for now.
   * dsa-check-packages: A better multi-arch capable version.
   * dsa-check-backuppg: Ignore .dotfiles and *.old in rootdir.
+  * dsa-check-hpacucli: Add --no-battery to ignore battery/capacitor failures
+    and disabled caches.
 
   [ Stephen Gran ]
   * dsa-check-udldap-freshness: check new last_update.trace if it
-- 
2.20.1