hpacucli: handle not configured controller with noraid status code. #145, #151

Author: glensc

lib/App/Monitoring/Plugin/CheckRaid/Plugins/hpacucli.pm

@@ -12,6 +12,8 @@ use base 'App::Monitoring::Plugin::CheckRaid::Plugin';
 use strict;
 use warnings;
 
+use constant E_NO_LOGICAL_DEVS => 'The specified device does not have any logical drives';
+
 sub program_names {
 	shift->{name};
 }
@@ -150,9 +152,9 @@ sub scan_luns {
 			next if /^$/ or /^#/;
 
 			# Error: The controller identified by "slot=attr_value_slot_unknown" was not detected.
-			if (/Error:/) {
+			if (/^Error:\s/) {
 				# store it somewhere. should it be appended?
-				$target->{'error'} = $_;
+				($target->{'error'}) = /^Error:\s+(.+?)\.?\s*$/;
 				$this->unknown;
 				next;
 			}
@@ -256,10 +258,21 @@ sub cstatus {
 	my (@s, $s);
 
 	# always include controller status
-	push(@s, $c->{'Controller Status'});
+	push(@s, $c->{'Controller Status'} || 'ERROR');
 	if ($c->{'Controller Status'} ne 'OK') {
 		$this->critical;
 	}
+
+	if ($c->{error}) {
+		if ($c->{error} eq E_NO_LOGICAL_DEVS) {
+			$this->noraid;
+			push(@s, 'Not configured');
+		} else {
+			$this->unknown;
+			push(@s, $c->{error});
+		}
+	}
+
 	# print those only if not ok and configured
 	if (($s = $c->{'Cache Status'}) && $s !~ /^(OK|Not Configured)/) {
 		push(@s, "Cache: $s");
@@ -273,7 +286,7 @@ sub cstatus {
 	# start with identifyier
 	my $name = $c->{chassisname} || $c->{controller};
 
-	return $name . '[' . join(' ', @s) . ']';
+	return $name . '[' . join(', ', @s) . ']';
 }
 
 sub check {
@@ -295,7 +308,9 @@ sub check {
 			}
 			push(@astatus, $this->astatus($array). '['. join(',', @lstatus). ']');
 		}
-		push(@status, $this->cstatus($ctrl). ': '. join(', ', @astatus));
+		my $cstatus = $this->cstatus($ctrl);
+		$cstatus .= ': '. join(', ', @astatus) if @astatus;
+		push(@status, $cstatus);
 	}
 
 	return unless @status;

t/check_hpacucli.t

@@ -29,7 +29,7 @@ my @tests = (
 		status => UNKNOWN,
 		controller => 'heracles/controller.all.show.status',
 		logical => 'heracles/logicaldrive.all.show',
-		message => 'Smart Array P400[OK]: ',
+		message => 'Smart Array P400[OK, Invalid target syntax. "attr_value_slot_unknown" is not a valid target]',
 		c => '3',
 	},
 	{
@@ -72,7 +72,7 @@ my @tests = (
 		status => UNKNOWN,
 		controller => '145/controller',
 		logical => '145/logicaldrive.slot1',
-		message => 'Smart Array P840[OK]: ',
+		message => 'Smart Array P840[OK, Not configured]',
 		targets => 'slot=1',
 		c => '145_slot1',
 	},
@@ -96,7 +96,7 @@ my @tests = (
 		status => UNKNOWN,
 		controller => '151/controller',
 		logical => '151/logicaldrive.slot3',
-		message => 'Smart Array P411[OK]: ',
+		message => 'Smart Array P411[OK, Not configured]',
 		targets => 'slot=3',
 		c => 'issue151_3',
 	},

t/dump/hpacucli/145_slot1

@@ -2,7 +2,7 @@ $VAR1 = [
           {
             'Controller Status' => 'OK',
             'controller' => 'Smart Array P840',
-            'error' => 'Error: The specified device does not have any logical drives.',
+            'error' => 'The specified device does not have any logical drives',
             'modes' => [
                          'HBA Mode'
                        ],

t/dump/hpacucli/3

@@ -3,7 +3,7 @@ $VAR1 = [
             'Cache Status' => 'OK',
             'Controller Status' => 'OK',
             'controller' => 'Smart Array P400',
-            'error' => 'Error: Invalid target syntax. "attr_value_slot_unknown" is not a valid target. ',
+            'error' => 'Invalid target syntax. "attr_value_slot_unknown" is not a valid target',
             'modes' => [],
             'slot' => 'ATTR_VALUE_SLOT_UNKNOWN',
             'target' => 'slot=ATTR_VALUE_SLOT_UNKNOWN'

t/dump/hpacucli/issue151_3

@@ -3,7 +3,7 @@ $VAR1 = [
             'Cache Status' => 'Not Configured',
             'Controller Status' => 'OK',
             'controller' => 'Smart Array P411',
-            'error' => 'Error: The specified device does not have any logical drives.',
+            'error' => 'The specified device does not have any logical drives',
             'modes' => [],
             'slot' => '3',
             'target' => 'slot=3'