From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 22 Jul 2008 22:57:40 +0000 (+0200)
Subject: [project @ peter@palfrader.org-20080722225740-scxy8ry0d8swsc7y]
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=bafe766e556a9839f0f5bb6cce8f4c9fc1c9f47c;p=mirror%2Fdsa-nagios.git

[project @ peter@palfrader.org-20080722225740-scxy8ry0d8swsc7y]
Learn correct transfer speed for Ultra 3 Wide
---

diff --git a/dsa-nagios-nrpe-config/debian/changelog b/dsa-nagios-nrpe-config/debian/changelog
index 53245b9..c4e3c8a 100644
--- a/dsa-nagios-nrpe-config/debian/changelog
+++ b/dsa-nagios-nrpe-config/debian/changelog
@@ -1,3 +1,9 @@
+dsa-nagios-nrpe-config (49) unstable; urgency=low
+
+  * dsa-check-hpacucli: Learn correct transfer speed for Ultra 3 Wide (160mb/s)
+
+ -- Peter Palfrader <weasel@debian.org>  Wed, 23 Jul 2008 00:56:54 +0200
+
 dsa-nagios-nrpe-config (48) unstable; urgency=low
 
   * Don't just print the sudoers lines to stdout, tell the admin to add them
diff --git a/dsa-nagios-nrpe-config/dsa-check-hpacucli b/dsa-nagios-nrpe-config/dsa-check-hpacucli
index 2bc260a..2fc7018 100755
--- a/dsa-nagios-nrpe-config/dsa-check-hpacucli
+++ b/dsa-nagios-nrpe-config/dsa-check-hpacucli
@@ -143,7 +143,19 @@ for my $slot (sort @controllers) {
 		my $expected;
 		if ($type eq 'SCSI') {
 			$key = 'Transfer Speed';
-			$expected = '320 MB/Sec';
+			if (!defined $value{'Transfer Mode'}) {
+				record('WARNING');
+				push @{$status{'unknown transfer mode'}}, $drive;
+				next;
+			} elsif ($value{'Transfer Mode'} eq 'Ultra 3 Wide') {
+				$expected = '160 MB/Sec';
+			} elsif ($value{'Transfer Mode'} eq 'Ultra 320 Wide') {
+				$expected = '320 MB/Sec';
+			} else {
+				record('WARNING');
+				push @{$status{'unknown transfer mode'}}, $drive."(".$value{'Transfer Mode'}.")";
+				next;
+			};
 		} elsif ($type eq 'SAS') {
 			$key = 'PHY Transfer Rate';
 			$expected = '3.0GBPS';