accept 6.0Gbps for SAS disks

diff --git a/dsa-nagios-checks/checks/dsa-check-hpacucli b/dsa-nagios-checks/checks/dsa-check-hpacucli
index 2d02f59..fcb4a34 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-hpacucli
+++ b/dsa-nagios-checks/checks/dsa-check-hpacucli
@@ -180,23 +180,17 @@ for my $slot (sort @controllers) {
                                push @{$status{'unknown transfer mode'}}, $drive."(".$value{'Transfer Mode'}.")";
                                next;
                        };
-               } elsif ($type eq 'SAS') {
+               } elsif ($type eq 'SAS' || $type eq 'SAS+') {
                        $key = 'PHY Transfer Rate';
                        if ($value{'PHY Count'} eq '2') {
                                if (defined($value{'Redundant Path(s)'})) {
-                                       $expected = '3.0GBPS, 3.0GBPS';
+                                       $expected = [ '3.0GBPS, 3.0GBPS', '6.0GBPS, 6.0GBPS' ];
                                } else {
-                                       $expected = [ '3.0GBPS, Unknown', 'Unknown, 3.0GBPS' ];
+                                       $expected = [ '3.0GBPS, Unknown', 'Unknown, 3.0GBPS',
+                                                     '6.0GBPS, Unknown', 'Unknown, 6.0GBPS' ];
                                }
                        } else {
-                               $expected = '3.0GBPS';
-                       }
-               } elsif ($type eq 'SAS+') {
-                       $key = 'PHY Transfer Rate';
-                       if ($value{'PHY Count'} eq '2') {
-                               $expected = '6.0GBPS, Unknown';
-                       } else {
-                               $expected = '6.0GBPS';
+                               $expected = [ '3.0GBPS', '6.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 aaa6225..d504525 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -11,8 +11,9 @@ dsa-nagios-checks (8x) xnstable; urgency=low
   * Add dsa-check-port-closed.
   * dsa-check-hpacucli: ignore the line for unassigned disks (patch by
     Emmanuel Lacour).
+  * dsa-check-hpacucli: accept 6.0Gbps for SAS disks.
 
- -- Peter Palfrader <weasel@debian.org>  Thu, 14 Oct 2010 17:07:29 +0200
+ -- Peter Palfrader <weasel@debian.org>  Fri, 15 Oct 2010 13:59:38 +0200
 
 dsa-nagios-checks (87) unstable; urgency=low