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 (executable)
--- 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 (file)
--- 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