From: Julien Cristau <jcristau@debian.org>
Date: Mon, 7 Dec 2015 10:17:28 +0000 (+0100)
Subject: dsa-check-hpssacli: accept 12.0Gbps as transfer speed for SAS
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=dbd4865bfa744c0558043a0f186904cbd19847b6;p=mirror%2Fdsa-nagios.git

dsa-check-hpssacli: accept 12.0Gbps as transfer speed for SAS
---

diff --git a/dsa-nagios-checks/checks/dsa-check-hpssacli b/dsa-nagios-checks/checks/dsa-check-hpssacli
index f9aa262..220d65b 100755
--- a/dsa-nagios-checks/checks/dsa-check-hpssacli
+++ b/dsa-nagios-checks/checks/dsa-check-hpssacli
@@ -248,13 +248,15 @@ for my $slot (sort @controllers) {
 				$expected = [ '1.5Gbps', '3.0Gbps' ];
 			} elsif ($value{'PHY Count'} eq '2') {
 				if (defined($value{'Redundant Path(s)'})) {
-					$expected = [ '3.0GBPS, 3.0GBPS', '6.0GBPS, 6.0GBPS' ];
+					$expected = [ '3.0GBPS, 3.0GBPS', '6.0GBPS, 6.0GBPS',
+					       	      '12.0GBPS, 12.0GBPS' ];
 				} else {
 					$expected = [ '3.0GBPS, Unknown', 'Unknown, 3.0GBPS',
-					              '6.0GBPS, Unknown', 'Unknown, 6.0GBPS' ];
+					              '6.0GBPS, Unknown', 'Unknown, 6.0GBPS',
+					              '12.0GBPS, Unknown', 'Unknown, 12.0GBPS' ];
 				}
 			} else {
-				$expected = [ '3.0GBPS', '6.0GBPS' ];
+				$expected = [ '3.0GBPS', '6.0GBPS', '12.0GBPS' ];
 			}
 		} else {
 			warn "Should not be here.  Do not know what to do with type '$type'\n";
diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index cd50bd5..a6e0bf6 100644
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -21,6 +21,7 @@ dsa-nagios-checks (108+XXXX) UNRELEASED; urgency=medium
 
   [ Julien Cristau ]
   * Add dsa-check-hpssacli, replaces hpacucli for new hosts.
+  * dsa-check-hpssacli: accept 12.0Gbps as transfer speed for SAS
 
  -- Peter Palfrader <weasel@debian.org>  Fri, 11 Sep 2015 10:21:15 +0200