X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-hpacucli;h=243d45c220afba5044d927042e8af3e41f7ea1ff;hb=790612890d8c7d07b6ff6e09db59f912d6d1e54a;hp=7f874612ff861bb7ca5b1363b98e3ea2860bcf93;hpb=45fb7baccdbbcf42526ec42ed9f78ee1e187400c;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-hpacucli b/dsa-nagios-checks/checks/dsa-check-hpacucli
index 7f87461..243d45c 100755
--- a/dsa-nagios-checks/checks/dsa-check-hpacucli
+++ b/dsa-nagios-checks/checks/dsa-check-hpacucli
@@ -108,10 +108,63 @@ if (scalar @controllers == 0) {
 my @resultstr;
 
 for my $slot (sort @controllers) {
-	my $pds = runcmd("controller slot=$slot pd all show");
 	my @drives;
 	my $nodrives = 0;
 	my %status;
+
+	my $ldallshow = runcmd("controller slot=$slot ld all show");
+	my @logicaldrives;
+	for (@$ldallshow) {
+		chomp;
+		next if /^$/;
+		next if (/^\S.*in Slot $slot/);
+		next if /^ *array [A-Z]$/;
+		if (/logicaldrive ([0-9a-z]+)/) {
+			push @logicaldrives, $1;
+			next;
+		} elsif (/^Error: The specified device does not have any logical drives.$/) {
+			$nodrives = 1;
+		} else {
+			die ("Cannot read line '$_' gotten from hpacucli controller slot = $slot logicaldrive all show\n");
+		}
+	};
+
+	# check logicaldrives
+	for my $logicaldrive (sort @logicaldrives) {
+		my $lds = runcmd("controller slot=$slot ld $logicaldrive show");
+		for (@$lds) {
+			chomp;
+			next if /^$/;
+			if (/^ *Parity Initialization Status: (Initialization Completed|Initialization Failed|Rebuilding)$/) {
+				my $status = $1;
+				if ($status eq 'Initialization Completed') {
+					push @{$status{'OK'}}, "Parity LD$logicaldrive";
+				} elsif ($status eq 'Rebuilding') {
+					push @{$status{'Failed'}}, "Parity LD$logicaldrive";
+					record('WARNING');
+				} elsif ($status eq 'Initialization Failed') {
+					push @{$status{'Failed'}}, "Parity LD$logicaldrive";
+					record('CRITICAL');
+				} else {
+					record('UNKNOWN');
+				}
+			}
+		}
+	}
+
+	if (!$nodrives && scalar @logicaldrives == 0) {
+		push @resultstr, "Slot $slot: unexpectedly, found no logical drives in list.";
+		record('UNKNOWN');
+	} elsif ($nodrives && scalar keys %status > 0) {
+		push @resultstr, "Slot $slot: have no logical drives but status results?";
+		record('UNKNOWN');
+		next;
+	} elsif ($nodrives) {
+		push @resultstr, "Slot $slot: no logical drives";
+	};
+
+
+	my $pds = runcmd("controller slot=$slot pd all show");
 	for (@$pds) {
 		chomp;
 		next if /^$/;
@@ -192,7 +245,7 @@ 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' ];
+				$expected = [ '1.5Gbps', '3.0Gbps' ];
 			} elsif ($value{'PHY Count'} eq '2') {
 				if (defined($value{'Redundant Path(s)'})) {
 					$expected = [ '3.0GBPS, 3.0GBPS', '6.0GBPS, 6.0GBPS' ];