X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-hpssacli;h=959198e314fbd8e6e18b28767c635927518448bf;hb=f62b4bd52da89a58d87a32e5b058b67e60815985;hp=f9aa26248e3dc924931db13e585a332fccf1fbb5;hpb=9bf85fcda0dd5c78e6bc51bc09bb5940c5e74383;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-hpssacli b/dsa-nagios-checks/checks/dsa-check-hpssacli
index f9aa262..959198e 100755
--- a/dsa-nagios-checks/checks/dsa-check-hpssacli
+++ b/dsa-nagios-checks/checks/dsa-check-hpssacli
@@ -149,6 +149,14 @@ for my $slot (sort @controllers) {
 					record('UNKNOWN');
 				}
 			}
+			if (/^ *LD Acceleration Method: (.*)$/) {
+				my $status = $1;
+				# can at least be "Controller Cache" or HP SSD Smart Path", both OK
+				if ($status eq 'All disabled') {
+					push @{$status{'Acceleration method'}}, "LD$logicaldrive disabled";
+					record('WARNING');
+				}
+			}
 		}
 	}
 
@@ -245,16 +253,18 @@ for my $slot (sort @controllers) {
 		} elsif ($type eq 'SAS' || $type eq 'SAS+') {
 			$key = 'PHY Transfer Rate';
 			if ($value{'Interface Type'} eq 'SATA') {
-				$expected = [ '1.5Gbps', '3.0Gbps' ];
+				$expected = [ '1.5Gbps', '3.0Gbps', '6.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";
@@ -298,9 +308,12 @@ for my $slot (sort @controllers) {
 		if (/^ *(.*) Status: (.*)$/) {
 			my $system = $1;
 			my $status = $2;
+
+			# skip the cache check, we track the LD Acceleration Method above
+			next if ($system eq 'Cache');
+
 			push @{$status{$status}}, $system;
 			if ($status ne 'OK') {
-				next if ($params->{'no-battery'} && $system eq 'Cache');
 				next if ($params->{'no-battery'} && $system eq 'Battery/Capacitor');
 				record('WARNING');
 			};