X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=dsa-nagios-checks%2Fchecks%2Fdsa-check-hpacucli;h=755a40604ad9c74d267bf8b1a20025d309ad2c47;hb=8343576a5b0ad8b543923637adb00bc73b420b6b;hp=ec3035096cbdf47675e33aae90627c063f066611;hpb=cc5f4a7190cc8e9baab078e699811900de6aa621;p=mirror%2Fdsa-nagios.git

diff --git a/dsa-nagios-checks/checks/dsa-check-hpacucli b/dsa-nagios-checks/checks/dsa-check-hpacucli
index ec30350..755a406 100755
--- a/dsa-nagios-checks/checks/dsa-check-hpacucli
+++ b/dsa-nagios-checks/checks/dsa-check-hpacucli
@@ -29,7 +29,6 @@
 use strict;
 use English;
 use Getopt::Long;
-use POSIX qw(uname);
 
 # nagios exit codes
 my %CODE = (
@@ -42,18 +41,13 @@ my %CODE = (
 my $EXITCODE = 'OK';
 
 $SIG{'__DIE__'} = sub {
-	print STDERR @_;
+	print @_;
 	exit $CODE{'UNKNOWN'};
 };
 
 sub runcmd($) {
 	my ($cmd) = @_;
-	my ($os, $host, $kernel, $date, $arch) = uname();
-	if ($kernel =~ m/^3(.*)/) {
-		$cmd = "sudo setarch x86_64 --uname-2.6 hpacucli $cmd";
-	} else {
-		$cmd = "sudo hpacucli $cmd";
-	}
+	$cmd = "sudo hpacucli $cmd";
 	open(FH, $cmd."|") or die ("Cannot run $cmd: $!");
 	my @lines = <FH>;
 	close FH;
@@ -214,11 +208,11 @@ for my $slot (sort @controllers) {
 			record('WARNING');
 			push @{$status{'unknown transfer speed'}}, $drive;
 		} elsif (ref($expected) eq 'ARRAY') {
-			if (scalar(grep { $value{$key} eq $_ } @$expected) == 0) {
+			if (scalar(grep { uc($value{$key}) eq uc($_) } @$expected) == 0) {
 				record('WARNING');
 				push @{$status{'bad transfer speed'}}, $drive."(".$value{$key}.")";
 			};
-		} elsif ($value{$key} ne $expected) {
+		} elsif (uc($value{$key}) ne uc($expected)) {
 			record('WARNING');
 			push @{$status{'bad transfer speed'}}, $drive."(".$value{$key}.")";
 		};