hpacucli: parse controller status

glensc · glensc · commit 03ae764982da · 2016-11-18T21:09:02.000+02:00
diff --git a/lib/App/Monitoring/Plugin/CheckRaid/Plugins/hpacucli.pm b/lib/App/Monitoring/Plugin/CheckRaid/Plugins/hpacucli.pm
@@ -82,9 +82,13 @@ sub scan_targets {
 	#  [licensekey all|<key>]
 
 	# Scan controllers
-	my (%targets);
+	my (%targets, $target);
 	my $fh = $this->cmd('controller status');
 	while (<$fh>) {
+		chomp;
+		# skip empty lines and artificial comments (added by this project)
+		next if /^$/ or /^#/;
+
 		# Numeric slot
 		if (my($controller, $slot, $modes) = /
 				^(\S.+)\sin\sSlot
@@ -94,8 +98,9 @@ sub scan_targets {
 				)?$
 			/x) {
 
-			$targets{"slot=$slot"} = {
-				target => "slot=$slot",
+			$target = "slot=$slot";
+			$targets{$target} = {
+				target => $target,
 				controller => $controller,
 				slot => $slot,
 				modes => split_controller_modes($modes || ''),
@@ -105,13 +110,21 @@ sub scan_targets {
 		}
 		# Named Entry
 		if (my($controller, $cn) = /^(\S.+) in (.+)/) {
-			$targets{"chassisname=$cn"} = {
-				target => "chassisname=$cn",
+			$target = "chassisname=$cn";
+			$targets{$target} = {
+				target => $target,
 				controller => $controller,
 				chassisname => $cn,
 			};
 			next;
 		}
+
+		# Other statuses, try "key: value" pairs
+		if (my ($key, $value) = /^\s*(.+?):\s+(.+?)$/) {
+			$targets{$target}{$key} = $value;
+		} else {
+			warn "Unparsed: [$_]\n";
+		}
 	}
 	close $fh;
 
diff --git a/t/data/hpacucli/151/controller b/t/data/hpacucli/151/controller
@@ -1,4 +1,4 @@
-root@xxx:~#  /usr/sbin/hpacucli controller all show status
+#root@xxx:~#  /usr/sbin/hpacucli controller all show status
 
 Smart Array P410i in Slot 0 (Embedded)
    Controller Status: OK
diff --git a/t/data/hpacucli/issue139/controller b/t/data/hpacucli/issue139/controller
@@ -1,4 +1,4 @@
-[root@xxx ~]# /sbin/hpssacli controller all show status
+#[root@xxx ~]# /sbin/hpssacli controller all show status
 
 Dynamic Smart Array B140i in Slot 0b
    Controller Status: OK
diff --git a/t/dump/hpacucli/1 b/t/dump/hpacucli/1
@@ -1,5 +1,8 @@
 $VAR1 = [
           {
+            'Battery/Capacitor Status' => 'OK',
+            'Cache Status' => 'OK',
+            'Controller Status' => 'OK',
             'array' => [
                          {
                            'logicaldrives' => [
@@ -19,6 +22,9 @@ $VAR1 = [
             'target' => 'chassisname=MY STORAGE'
           },
           {
+            'Battery/Capacitor Status' => 'OK',
+            'Cache Status' => 'OK',
+            'Controller Status' => 'OK',
             'array' => [
                          {
                            'logicaldrives' => [
diff --git a/t/dump/hpacucli/145 b/t/dump/hpacucli/145
@@ -1,5 +1,6 @@
 $VAR1 = [
           {
+            'Controller Status' => 'OK',
             'array' => [
                          {
                            'logicaldrives' => [
@@ -23,6 +24,7 @@ $VAR1 = [
             'target' => 'slot=0'
           },
           {
+            'Controller Status' => 'OK',
             'array' => [
                          {
                            'logicaldrives' => [
diff --git a/t/dump/hpacucli/145_slot1 b/t/dump/hpacucli/145_slot1
@@ -1,5 +1,6 @@
 $VAR1 = [
           {
+            'Controller Status' => 'OK',
             'array' => [
                          {
                            'logicaldrives' => [
diff --git a/t/dump/hpacucli/2 b/t/dump/hpacucli/2
@@ -1,5 +1,8 @@
 $VAR1 = [
           {
+            'Battery/Capacitor Status' => 'OK',
+            'Cache Status' => 'OK',
+            'Controller Status' => 'OK',
             'array' => [
                          {
                            'logicaldrives' => [
@@ -19,6 +22,9 @@ $VAR1 = [
             'target' => 'chassisname=MY STORAGE'
           },
           {
+            'Battery/Capacitor Status' => 'OK',
+            'Cache Status' => 'OK',
+            'Controller Status' => 'OK',
             'array' => [
                          {
                            'logicaldrives' => [
diff --git a/t/dump/hpacucli/3 b/t/dump/hpacucli/3
@@ -1,5 +1,7 @@
 $VAR1 = [
           {
+            'Cache Status' => 'OK',
+            'Controller Status' => 'OK',
             'controller' => 'Smart Array P400',
             'modes' => [],
             'slot' => 'ATTR_VALUE_SLOT_UNKNOWN',
diff --git a/t/dump/hpacucli/4 b/t/dump/hpacucli/4
@@ -1,5 +1,8 @@
 $VAR1 = [
           {
+            'Battery/Capacitor Status' => 'OK',
+            'Cache Status' => 'OK',
+            'Controller Status' => 'OK',
             'array' => [
                          {
                            'logicaldrives' => [
diff --git a/t/dump/hpacucli/5 b/t/dump/hpacucli/5
@@ -1,5 +1,8 @@
 $VAR1 = [
           {
+            'Battery/Capacitor Status' => 'OK',
+            'Cache Status' => 'OK',
+            'Controller Status' => 'OK',
             'array' => [
                          {
                            'logicaldrives' => [
diff --git a/t/dump/hpacucli/6 b/t/dump/hpacucli/6
@@ -1,5 +1,6 @@
 $VAR1 = [
           {
+            'Controller Status' => 'OK',
             'array' => [
                          {
                            'logicaldrives' => [
diff --git a/t/dump/hpacucli/issue139 b/t/dump/hpacucli/issue139
@@ -1,5 +1,6 @@
 $VAR1 = [
           {
+            'Controller Status' => 'OK',
             'array' => [
                          {
                            'logicaldrives' => [
diff --git a/t/dump/hpacucli/issue151_0 b/t/dump/hpacucli/issue151_0
@@ -1,5 +1,8 @@
 $VAR1 = [
           {
+            'Battery/Capacitor Status' => 'OK',
+            'Cache Status' => 'OK',
+            'Controller Status' => 'OK',
             'array' => [
                          {
                            'logicaldrives' => [
diff --git a/t/dump/hpacucli/issue151_3 b/t/dump/hpacucli/issue151_3
@@ -1,5 +1,7 @@
 $VAR1 = [
           {
+            'Cache Status' => 'Not Configured',
+            'Controller Status' => 'OK',
             'controller' => 'Smart Array P411',
             'modes' => [],
             'slot' => '3',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-root@xxx:~# /usr/sbin/hpacucli controller all show status`
	`1`	`+#root@xxx:~# /usr/sbin/hpacucli controller all show status`
`2`	`2`
`3`	`3`	`Smart Array P410i in Slot 0 (Embedded)`
`4`	`4`	`Controller Status: OK`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-[root@xxx ~]# /sbin/hpssacli controller all show status`
	`1`	`+#[root@xxx ~]# /sbin/hpssacli controller all show status`
`2`	`2`
`3`	`3`	`Dynamic Smart Array B140i in Slot 0b`
`4`	`4`	`Controller Status: OK`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`$VAR1 = [`
`2`	`2`	`{`
	`3`	`+ 'Battery/Capacitor Status' => 'OK',`
	`4`	`+ 'Cache Status' => 'OK',`
	`5`	`+ 'Controller Status' => 'OK',`
`3`	`6`	`'array' => [`
`4`	`7`	`{`
`5`	`8`	`'logicaldrives' => [`
`@@ -19,6 +22,9 @@ $VAR1 = [`
`19`	`22`	`'target' => 'chassisname=MY STORAGE'`
`20`	`23`	`},`
`21`	`24`	`{`
	`25`	`+ 'Battery/Capacitor Status' => 'OK',`
	`26`	`+ 'Cache Status' => 'OK',`
	`27`	`+ 'Controller Status' => 'OK',`
`22`	`28`	`'array' => [`
`23`	`29`	`{`
`24`	`30`	`'logicaldrives' => [`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`$VAR1 = [`
`2`	`2`	`{`
	`3`	`+ 'Controller Status' => 'OK',`
`3`	`4`	`'array' => [`
`4`	`5`	`{`
`5`	`6`	`'logicaldrives' => [`
`@@ -23,6 +24,7 @@ $VAR1 = [`
`23`	`24`	`'target' => 'slot=0'`
`24`	`25`	`},`
`25`	`26`	`{`
	`27`	`+ 'Controller Status' => 'OK',`
`26`	`28`	`'array' => [`
`27`	`29`	`{`
`28`	`30`	`'logicaldrives' => [`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`$VAR1 = [`
`2`	`2`	`{`
	`3`	`+ 'Cache Status' => 'OK',`
	`4`	`+ 'Controller Status' => 'OK',`
`3`	`5`	`'controller' => 'Smart Array P400',`
`4`	`6`	`'modes' => [],`
`5`	`7`	`'slot' => 'ATTR_VALUE_SLOT_UNKNOWN',`