X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-raid-aacraid;h=3e7375be4349cd412778457debdc6c495ac9ade7;hb=6b23f07c2d4436cb8de3f7925f8419212d07f738;hp=0b82c475689a2c37c9c3cd1352c6bf4161e3d78c;hpb=0c28424359fbab9c5662c9b60766c8236e2c0cc1;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-raid-aacraid b/dsa-nagios-checks/checks/dsa-check-raid-aacraid
index 0b82c47..3e7375b 100755
--- a/dsa-nagios-checks/checks/dsa-check-raid-aacraid
+++ b/dsa-nagios-checks/checks/dsa-check-raid-aacraid
@@ -59,7 +59,7 @@ sub record($) {
 }
 
 # arcconf puts crap into a $PWD/UcliEvt.log file.
-my $dir = tempdir( "check-aacraid-XXXXXXX", CLEANUP => 1 );
+my $dir = tempdir( "/tmp/check-aacraid-XXXXXXX", CLEANUP => 1 );
 chdir ($dir) or die ("Cannot chdir $dir: $!\n");
 
 my $ctrl = 1;
@@ -121,7 +121,7 @@ while ($ctrl <= $numcontrollers) {
 			my $status = $1;
 			if ($status eq 'Not Installed') {
 				next;
-			} elsif ($status ne 'Optimal') {
+			} elsif ($status ne 'Optimal' && $status ne 'ZMM Optimal') {
 				record('WARNING');
 			};
 			push @{$status{$status}}, 'Battery';
@@ -136,5 +136,12 @@ while ($ctrl <= $numcontrollers) {
 	$ctrl++;
 };
 
+if ( -e 'UcliEvt.log' ) {
+	unlink('UcliEvt.log') or die ("Cannot unlink UcliEvt.log: $!\n");
+}
+
+# Need to chdir out of tempdir in order to rm it in new perl
+chdir ('/') or die ("Cannot chdir /: $!\n");
+
 print "$EXITCODE: ", join(" --- ", @resultstr), "\n";
 exit $CODE{$EXITCODE};