From 59807a3f3ff8398c5d6d0a35d7e7aeb4c5eeca18 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 22 Nov 2010 13:56:20 +0100 Subject: [PATCH] dsa-check-hpasm: Incorporate patch from Jan Wagner to ignore "N/A" DIMM status. --- dsa-nagios-checks/checks/dsa-check-hpasm | 6 ++++-- dsa-nagios-checks/debian/changelog | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dsa-nagios-checks/checks/dsa-check-hpasm b/dsa-nagios-checks/checks/dsa-check-hpasm index 83f2ae6..fc98866 100755 --- a/dsa-nagios-checks/checks/dsa-check-hpasm +++ b/dsa-nagios-checks/checks/dsa-check-hpasm @@ -47,13 +47,14 @@ my %callbacks = ( my $params = {}; -my $USAGE = "PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant] [--fan-no-redundant] [--fan-high]\n"; +my $USAGE = "PROGRAM_NAME: Usage: $PROGRAM_NAME [--help] [--ps-no-redundant] [--fan-no-redundant] [--fan-high] [--dimm-na]\n"; Getopt::Long::config('bundling'); if (!GetOptions ( '--help' => \$params->{'help'}, '--ps-no-redundant' => \$params->{'ps-no-redundant'}, '--fan-no-redundant' => \$params->{'fan-no-redundant'}, '--fan-high' => \$params->{'fan-high'}, + '--dimm-na' => \$params->{'dimm-na'}, )) { die ("$USAGE"); }; @@ -83,7 +84,8 @@ sub do_dimm { if ($line =~ /(^\s*$|-----)/) { if ($in_block) { - if ($status ne 'Ok') { + unless (($status eq 'Ok') || + ($params->{'dimm-na'} && $status eq 'N/A')) { $message = sprintf("DIMM%d: %s ", $dimm_num, $status); $exit_status |= 2; } diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog index d504525..08bc29b 100644 --- a/dsa-nagios-checks/debian/changelog +++ b/dsa-nagios-checks/debian/changelog @@ -12,8 +12,10 @@ dsa-nagios-checks (8x) xnstable; urgency=low * dsa-check-hpacucli: ignore the line for unassigned disks (patch by Emmanuel Lacour). * dsa-check-hpacucli: accept 6.0Gbps for SAS disks. + * dsa-check-hpasm: Incorporate patch from Jan Wagner to ignore "N/A" DIMM + status. - -- Peter Palfrader Fri, 15 Oct 2010 13:59:38 +0200 + -- Peter Palfrader Mon, 22 Nov 2010 13:56:04 +0100 dsa-nagios-checks (87) unstable; urgency=low -- 2.20.1