dsa-check-hpacucli: Also accept 'Unknown, 3.0GBPS' as a valid transferspeed

diff --git a/dsa-nagios-checks/checks/dsa-check-hpacucli b/dsa-nagios-checks/checks/dsa-check-hpacucli
index ef79db8..52e0ebb 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-hpacucli
+++ b/dsa-nagios-checks/checks/dsa-check-hpacucli
@@ -169,7 +169,7 @@ for my $slot (sort @controllers) {
                                if (defined($value{'Redundant Path(s)'})) {
                                        $expected = '3.0GBPS, 3.0GBPS';
                                } else {
-                                       $expected = '3.0GBPS, Unknown';
+                                       $expected = [ '3.0GBPS, Unknown', 'Unknown, 3.0GBPS' ];
                                }
                        } else {
                                $expected = '3.0GBPS';
@@ -189,6 +189,11 @@ for my $slot (sort @controllers) {
                if (!defined $value{$key}) {
                        record('WARNING');
                        push @{$status{'unknown transfer speed'}}, $drive;
+               } elsif (ref($expected) eq 'ARRAY') {
+                       if (scalar(grep { $value{$key} eq $_ } @$expected) == 0) {
+                               record('WARNING');
+                               push @{$status{'bad transfer speed'}}, $drive."(".$value{$key}.")";
+                       };
                } elsif ($value{$key} ne $expected) {
                        record('WARNING');
                        push @{$status{'bad transfer speed'}}, $drive."(".$value{$key}.")";

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index 313a3d9..f408120 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -1,3 +1,10 @@
+dsa-nagios-checks (88) unstable; urgency=low
+
+  * dsa-check-hpacucli: Also accept 'Unknown, 3.0GBPS' as a valid
+    transfer speed in addition to '3.0GBPS, Unknown'.
+
+ -- Peter Palfrader <weasel@debian.org>  Thu, 12 Aug 2010 13:35:10 +0200
+
 dsa-nagios-checks (87) unstable; urgency=low
 
   [ Uli Martens ]