From 84920787b1f4cd0b5badef3970848c745b6e7409 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 30 May 2013 20:00:31 +0200
Subject: [PATCH] dsa-check-hpacucli updates for our blades

- support filtering controllers.
- add an option to accept no-controllers as an OK state.
---
 dsa-nagios-checks/checks/dsa-check-hpacucli | 14 +++++++++++---
 dsa-nagios-checks/debian/changelog          |  3 +++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/dsa-nagios-checks/checks/dsa-check-hpacucli b/dsa-nagios-checks/checks/dsa-check-hpacucli
index 755a406..8bbb7eb 100755
--- a/dsa-nagios-checks/checks/dsa-check-hpacucli
+++ b/dsa-nagios-checks/checks/dsa-check-hpacucli
@@ -64,12 +64,14 @@ sub record($) {
 	};
 }
 
-my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--no-battery] [--ignore-transfer-speed=<pd> [--ignore-transfer-speed=<pd> ...]]\n";
+my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--no-battery] [--ignore-controller=<regex>] [--no-controller-ok] [--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'},
+	'--no-controller-ok'          => \$params->{'no-controller-ok'},
+	'--ignore-controller=s'       => \$params->{'ignore-controller'},
 	'--ignore-transfer-speed=s@'  => \$params->{'ignore-transfer-speed'},
 	)) {
 	die ($usage);
@@ -85,6 +87,7 @@ my @controllers;
 for (@$ctrlallshow) {
 	chomp;
 	next if /^$/;
+	next if ($params->{'ignore-controller'} && /$params->{'ignore-controller'}/);
 	if (/in Slot ([0-9a-z]+)/) {
 		push @controllers, $1;
 		next;
@@ -93,8 +96,13 @@ for (@$ctrlallshow) {
 };
 
 if (scalar @controllers == 0) {
-	print "UNKNONW: No smartarray controllers found with hpacucli\n";
-	exit $CODE{'UNKNOWN'}
+	if ($params->{'no-controller-ok'}) {
+		print "No smartarray controllers found with hpacucli\n";
+		exit $CODE{'OK'}
+	} else {
+		print "UNKNOWN: No smartarray controllers found with hpacucli\n";
+		exit $CODE{'UNKNOWN'}
+	}
 };
 
 my @resultstr;
diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 3d54a53..c0bfae0 100644
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -4,6 +4,9 @@ dsa-nagios-checks (96) UNRELEASED; urgency=low
     Allow supplying the nameservers to start recursion at (per zone).
     This is useful for reverse zones of RFC1918 space.
   * dsa-check-bacula: exit status fix.
+  * dsa-check-hpacucli:
+    - support filtering controllers.
+    - add an option to accept no-controllers as an OK state.
 
  -- Peter Palfrader <weasel@debian.org>  Tue, 23 Apr 2013 20:12:09 +0200
 
-- 
2.20.1