nrpe is bad about reading stderr

[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 fcb4a34..8f62bb9 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-hpacucli
+++ b/dsa-nagios-checks/checks/dsa-check-hpacucli
@@ -5,7 +5,7 @@
 #
 # does _not_ check raid status.  use arrayprobe for that.
 
-# Copyright (c) 2008,2009 Peter Palfrader <peter@palfrader.org>
+# Copyright (c) 2008,2009,2010,2011 Peter Palfrader <peter@palfrader.org>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -41,7 +41,7 @@ my %CODE = (
 my $EXITCODE = 'OK';
 
 $SIG{'__DIE__'} = sub {
-       print STDERR @_;
+       print @_;
        exit $CODE{'UNKNOWN'};
 };
 
@@ -64,11 +64,12 @@ sub record($) {
        };
 }
 
-my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--ignore-transfer-speed=<pd> [--ignore-transfer-speed=<pd> ...]]\n";
+my $usage = "$PROGRAM_NAME: Usage: $PROGRAM_NAME [--no-battery] [--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'},
        '--ignore-transfer-speed=s@'  => \$params->{'ignore-transfer-speed'},
        )) {
        die ($usage);
@@ -197,11 +198,11 @@ for my $slot (sort @controllers) {
                        next;
                }
 
-               if (exists $params->{'ignore-transfer-speed'}) {
+               if ($params->{'ignore-transfer-speed'}) {
                        if (grep { $drive eq $_ } @{$params->{'ignore-transfer-speed'}}) {
                                push @{$status{'ignored transfer speed'}}, $drive."(".$value{$key}.")";
+                               next;
                        };
-                       next;
                };
                if (!defined $value{$key}) {
                        record('WARNING');
@@ -236,6 +237,8 @@ for my $slot (sort @controllers) {
                        my $status = $2;
                        push @{$status{$status}}, $system;
                        if ($status ne 'OK') {
+                               next if ($params->{'no-battery'} && $system eq 'Cache');
+                               next if ($params->{'no-battery'} && $system eq 'Battery/Capacitor');
                                record('WARNING');
                        };
                } else {