Fix --ignore-transfer-speed to not always ignore transfer speed

[mirror/dsa-nagios.git] / dsa-nagios-checks / checks / dsa-check-hpacucli

diff --git a/dsa-nagios-checks/checks/dsa-check-hpacucli b/dsa-nagios-checks/checks/dsa-check-hpacucli
index bf2fb17..7aff0c3 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-hpacucli
+++ b/dsa-nagios-checks/checks/dsa-check-hpacucli
@@ -108,6 +108,7 @@ for my $slot (sort @controllers) {
                next if /^$/;
                next if (/^\S.*in Slot $slot/);
                next if /^ *array [A-Z]$/;
+               next if /^ *unassigned/;
                if (/^ *(array [A-Z]) \(Failed\)$/) {
                        record('CRITICAL');
                        push @{$status{'Failed'}}, $1;
@@ -179,30 +180,24 @@ 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";
                        next;
                }
 
-               if (exists $params->{'ignore-transfer-speed'}) {
+               if ($params->{'ignore-transfer-speed'}) {
                        if (grep { $drive eq $_ } @{$params->{'ignore-transfer-speed'}}) {
                                push @{$status{'ignored transfer speed'}}, $drive."(".$value{$key}.")";
                        };