X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-hpacucli;h=7aff0c36ae0054148b0642858f6abbf3abd65de4;hb=e3310892896fd02325d687672a52b25b247bd134;hp=06c6fadeb7c48405a617461ad7d032b2d689f4c1;hpb=e3cfeb337e78da4392097b8334cb3bd7f49a4aa0;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-hpacucli b/dsa-nagios-checks/checks/dsa-check-hpacucli
index 06c6fad..7aff0c3 100755
--- a/dsa-nagios-checks/checks/dsa-check-hpacucli
+++ b/dsa-nagios-checks/checks/dsa-check-hpacucli
@@ -27,6 +27,8 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 use strict;
+use English;
+use Getopt::Long;
 
 # nagios exit codes
 my %CODE = (
@@ -62,6 +64,20 @@ sub record($) {
 	};
 }
 
+my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--ignore-transfer-speed=<pd> [--ignore-transfer-speed=<pd> ...]]\n";
+my $params;
+Getopt::Long::Configure('bundling');
+if (!GetOptions (
+	'--help'                      => \$params->{'help'},
+	'--ignore-transfer-speed=s@'  => \$params->{'ignore-transfer-speed'},
+	)) {
+	die ($usage);
+};
+if ($params->{'help'}) {
+	print $usage;
+	exit (0);
+};
+die ($usage) unless (scalar @ARGV == 0);
 
 my $ctrlallshow = runcmd("controller all show");
 my @controllers;
@@ -92,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;
@@ -126,6 +143,8 @@ for my $slot (sort @controllers) {
 			$type = 'SCSI';
 		} elsif ($drive =~ /^[0-9]+[EI]:[0-9]+:[0-9]+$/) { # SAS
 			$type = 'SAS';
+		} elsif ($drive =~ /^[0-9]+[C]:[0-9]+:[0-9]+$/) { # New 6GBPS SAS
+			$type = 'SAS+';
 		} else {
 			# I'm not going to run pass arguments of unknown form to the shell..
 			warn ("Unknown diskdrive ID $drive\n");
@@ -161,21 +180,37 @@ 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') {
-				$expected = '3.0GBPS, Unknown';
+				if (defined($value{'Redundant Path(s)'})) {
+					$expected = [ '3.0GBPS, 3.0GBPS', '6.0GBPS, 6.0GBPS' ];
+				} else {
+					$expected = [ '3.0GBPS, Unknown', 'Unknown, 3.0GBPS',
+					              '6.0GBPS, Unknown', 'Unknown, 6.0GBPS' ];
+				}
 			} else {
-				$expected = '3.0GBPS';
+				$expected = [ '3.0GBPS', '6.0GBPS' ];
 			}
 		} else {
 			warn "Should not be here.  Do not know what to do with type '$type'\n";
 			next;
 		}
 
+		if ($params->{'ignore-transfer-speed'}) {
+			if (grep { $drive eq $_ } @{$params->{'ignore-transfer-speed'}}) {
+				push @{$status{'ignored transfer speed'}}, $drive."(".$value{$key}.")";
+			};
+			next;
+		};
 		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}.")";