[Pkg-nagios-changes] [pkg-nagios-plugins-contrib] 02/03: check_raid: Update to 4.0.5

[Jan Wagner]

This is an automated email from the git hooks/post-receive script.

waja pushed a commit to branch master
in repository pkg-nagios-plugins-contrib.

commit 985772d7ae7ba8dc713dde161af780fc1cf5f8f8
Author: Jan Wagner <waja at cyconet.org>
Date:   Wed Jan 4 00:22:06 2017 +0100

    check_raid: Update to 4.0.5
---
 check_raid/check_raid | 21 ++++++++++++++++++---
 check_raid/control    |  2 +-
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/check_raid/check_raid b/check_raid/check_raid
index 481730f..33e724e 100644
--- a/check_raid/check_raid
+++ b/check_raid/check_raid
@@ -1471,6 +1471,7 @@ $fatpacked{"App/Monitoring/Plugin/CheckRaid/Plugins/cciss.pm"} = '#line '.(1+__L
   
   use base 'App::Monitoring::Plugin::CheckRaid::Plugin';
   use App::Monitoring::Plugin::CheckRaid::Plugins::lsscsi;
+  use App::Monitoring::Plugin::CheckRaid::Plugins::smartctl;
   use strict;
   use warnings;
   
@@ -1692,6 +1693,9 @@ $fatpacked{"App/Monitoring/Plugin/CheckRaid/Plugins/cciss.pm"} = '#line '.(1+__L
   	while (<$fh>) {
   		chomp;
   
+  		# skip empty lines and artificial comments (added by this project)
+  		next if /^$/ or /^#/;
+  
   		if (/Controller:/) {
   			# this is first item when new controller is found
   			# reset previous state
@@ -2920,6 +2924,14 @@ $fatpacked{"App/Monitoring/Plugin/CheckRaid/Plugins/hpacucli.pm"} = '#line '.(1+
   		# skip empty lines and artificial comments (added by this project)
   		next if /^$/ or /^#/;
   
+  		# skip known noise
+  		if (
+  			/FIRMWARE UPGRADE REQUIRED: /
+  			|| /^\s{27}/
+  		) {
+  			next;
+  		}
+  
   		# Numeric slot
   		if (my($controller, $slot, $modes) = /
   				^(\S.+)\sin\sSlot
@@ -2939,6 +2951,7 @@ $fatpacked{"App/Monitoring/Plugin/CheckRaid/Plugins/hpacucli.pm"} = '#line '.(1+
   			$this->unknown if $slot !~ /^\d+/;
   			next;
   		}
+  
   		# Named Entry
   		if (my($controller, $cn) = /^(\S.+) in (.+)/) {
   			$target = "chassisname=$cn";
@@ -2953,9 +2966,10 @@ $fatpacked{"App/Monitoring/Plugin/CheckRaid/Plugins/hpacucli.pm"} = '#line '.(1+
   		# Other statuses, try "key: value" pairs
   		if (my ($key, $value) = /^\s*(.+?):\s+(.+?)$/) {
   			$targets{$target}{$key} = $value;
-  		} else {
-  			warn "Unparsed: [$_]\n";
+  			next;
   		}
+  
+  		warn "Unparsed: [$_]\n";
   	}
   	close $fh;
   
@@ -6238,7 +6252,7 @@ use warnings;
 use strict;
 
 my $PROGNAME = 'check_raid';
-my $VERSION = q/4.0.4/;
+my $VERSION = q/4.0.5/;
 my $URL = 'https://github.com/glensc/nagios-plugin-check_raid';
 my $BUGS_URL = 'https://github.com/glensc/nagios-plugin-check_raid#reporting-bugs';
 
@@ -6372,6 +6386,7 @@ my $mc = App::Monitoring::Plugin::CheckRaid->new(%plugin_options);
 $App::Monitoring::Plugin::CheckRaid::Utils::debug = $mp->opts->debug;
 
 if ($mp->opts->debug) {
+	print "$PROGNAME $VERSION\n";
 	print "Visit <$BUGS_URL> how to report bugs\n\n",
 }
 
diff --git a/check_raid/control b/check_raid/control
index 4df636a..0b8fa5a 100644
--- a/check_raid/control
+++ b/check_raid/control
@@ -1,7 +1,7 @@
 Homepage: https://github.com/glensc/nagios-plugin-check_raid
 Watch: https://github.com/glensc/nagios-plugin-check_raid "/glensc/nagios-plugin-check_raid/tree/([0-9.]+)"
 Suggests: cciss-vol-status (>= 1.10), mpt-status
-Version: 4.0.4
+Version: 4.0.5
 Uploaders: Bernd Zeimetz <bzed at debian.org>
 Description: plugin to check sw/hw RAID status
  The plugin looks for any known types of RAID configurations,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagios-plugins-contrib.git