X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=dsa-nagios-nrpe-config%2Fdsa-check-hpacucli;h=a34738897ac81903992fd2c34e983426310c4e95;hb=3a428f4d446804f303f626fb1ce25265a960f6e5;hp=a3c42c742f6cce33c338415a77491f6fd5600823;hpb=972fb04e546e2f19403aae970c26a472599731ef;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-nrpe-config/dsa-check-hpacucli b/dsa-nagios-nrpe-config/dsa-check-hpacucli
index a3c42c7..a347388 100755
--- a/dsa-nagios-nrpe-config/dsa-check-hpacucli
+++ b/dsa-nagios-nrpe-config/dsa-check-hpacucli
@@ -119,6 +119,8 @@ for my $slot (sort @controllers) {
 	# Check that all drives have the proper transfer speed.
 	# sometimes stuff breaks and they fall back to 10mb/sec.
 	for my $drive (@drives) {
+		# skip drives that are known to have failed
+		next if (exists $status{'Failed'} && grep {$drive eq $_} @{$status{'Failed'}});
 		my $type;
 		if ($drive =~ /^[0-9]+:[0-9]+$/) { # scsi drives
 			$type = 'SCSI';
@@ -161,7 +163,11 @@ for my $slot (sort @controllers) {
 			};
 		} elsif ($type eq 'SAS') {
 			$key = 'PHY Transfer Rate';
-			$expected = '3.0GBPS';
+			if ($value{'PHY Count'} eq '2') {
+				$expected = '3.0GBPS, Unknown';
+			} else {
+				$expected = '3.0GBPS';
+			}
 		} else {
 			warn "Should not be here.  Do not know what to do with type '$type'\n";
 			next;