dsa-check-hpacucli updates for our blades

[mirror/dsa-nagios.git] / dsa-nagios-checks / checks / dsa-check-hpacucli

diff --git a/dsa-nagios-checks/checks/dsa-check-hpacucli b/dsa-nagios-checks/checks/dsa-check-hpacucli
index ec30350..8bbb7eb 100755 (executable)
--- 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;
@@ -70,12 +64,14 @@ sub record($) {
        };
 }
 
-my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--no-battery] [--ignore-transfer-speed=<pd> [--ignore-transfer-speed=<pd> ...]]\n";
+my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--no-battery] [--ignore-controller=<regex>] [--no-controller-ok] [--ignore-transfer-speed=<pd> [--ignore-transfer-speed=<pd> ...]]\n";
 my $params;
 Getopt::Long::Configure('bundling');
 if (!GetOptions (
        '--help'                      => \$params->{'help'},
        '--no-battery'                => \$params->{'no-battery'},
+       '--no-controller-ok'          => \$params->{'no-controller-ok'},
+       '--ignore-controller=s'       => \$params->{'ignore-controller'},
        '--ignore-transfer-speed=s@'  => \$params->{'ignore-transfer-speed'},
        )) {
        die ($usage);
@@ -91,6 +87,7 @@ my @controllers;
 for (@$ctrlallshow) {
        chomp;
        next if /^$/;
+       next if ($params->{'ignore-controller'} && /$params->{'ignore-controller'}/);
        if (/in Slot ([0-9a-z]+)/) {
                push @controllers, $1;
                next;
@@ -99,8 +96,13 @@ for (@$ctrlallshow) {
 };
 
 if (scalar @controllers == 0) {
-       print "UNKNONW: No smartarray controllers found with hpacucli\n";
-       exit $CODE{'UNKNOWN'}
+       if ($params->{'no-controller-ok'}) {
+               print "No smartarray controllers found with hpacucli\n";
+               exit $CODE{'OK'}
+       } else {
+               print "UNKNOWN: No smartarray controllers found with hpacucli\n";
+               exit $CODE{'UNKNOWN'}
+       }
 };
 
 my @resultstr;
@@ -214,11 +216,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}.")";
                };