[Pkg-nagios-changes] [pkg-nagios] r1995 - in nagios-plugins/trunk/debian: . patches

[Jan Wagner]

tags 654259 pending
thanks

Author: waja
Date: 2012-02-23 22:37:16 +0000 (Thu, 23 Feb 2012)
New Revision: 1995

Added:
   nagios-plugins/trunk/debian/patches/03_check_disk_smb_perfdata.dpatch
Modified:
   nagios-plugins/trunk/debian/changelog
   nagios-plugins/trunk/debian/patches/00list
Log:
add perfdata to check_disk_smb

Modified: nagios-plugins/trunk/debian/changelog
===================================================================
--- nagios-plugins/trunk/debian/changelog	2012-02-23 21:40:10 UTC (rev 1994)
+++ nagios-plugins/trunk/debian/changelog	2012-02-23 22:37:16 UTC (rev 1995)
@@ -9,6 +9,8 @@
     duplicate messages when certificate errors occures, thanks Sebastian Harl
     for reporting
   * Add build-arch and build-indep targets to debian/rules
+  * Add 03_check_disk_smb_perfdata.dpatch to add perfdata to check_disk_smb
+   (Closes: #654259), thanks to G. Leimua
 
  -- Jan Wagner <waja at cyconet.org>  Wed, 07 Sep 2011 15:33:55 +0200
 

Modified: nagios-plugins/trunk/debian/patches/00list
===================================================================
--- nagios-plugins/trunk/debian/patches/00list	2012-02-23 21:40:10 UTC (rev 1994)
+++ nagios-plugins/trunk/debian/patches/00list	2012-02-23 22:37:16 UTC (rev 1995)
@@ -11,3 +11,4 @@
 16_check_raduis_fix_format-security.dpatch
 17_check_tcp_fix_duplicate_cert_message.dpatch
 17_check_smtp_fix_duplicate_cert_message.dpatch
+03_check_disk_smb_perfdata.dpatch

Added: nagios-plugins/trunk/debian/patches/03_check_disk_smb_perfdata.dpatch
===================================================================
--- nagios-plugins/trunk/debian/patches/03_check_disk_smb_perfdata.dpatch	                        (rev 0)
+++ nagios-plugins/trunk/debian/patches/03_check_disk_smb_perfdata.dpatch	2012-02-23 22:37:16 UTC (rev 1995)
@@ -0,0 +1,102 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_check_disk_smb_perfdata.dpatch by G. Leimua <gaufrettes.aumiel at gmail.com>
+##
+## DP: Add perfdata fo check_disk_smb (http://bugs.debian.org/654259)
+
+ at DPATCH@
+
+diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
+index 7c81fc2..bca9552 100755
+--- a/plugins-scripts/check_disk_smb.pl
++++ b/plugins-scripts/check_disk_smb.pl
+@@ -166,6 +166,7 @@ my $address = $1 if (defined($opt_a) && $opt_a =~ /(.*)/);
+ my $state = "OK";
+ my $answer = undef;
+ my $res = undef;
++my $perfdata = "";
+ my @lines = undef;
+ 
+ # Just in case of problems, let's not hang Nagios
+@@ -204,11 +205,23 @@ $_ = $lines[$#lines];
+ #If line does not match required regexp, return an UNKNOWN error
+ if (/\s*(\d*) blocks of size (\d*)\. (\d*) blocks available/) {
+ 
+-	my ($avail) = ($3*$2)/1024;
+-	my ($avail_bytes) = $avail;
++	my ($avail_bytes) = $3 * $2;
++	my ($total_bytes) = $1 * $2;
++	my ($occupied_bytes) = $1 * $2 - $avail_bytes;
++	my ($avail) = $avail_bytes/1024;
+ 	my ($capper) = int(($3/$1)*100);
+ 	my ($mountpt) = "\\\\$host\\$share";
+ 
++	# TODO : why is the kB the standard unit for args ?
++	my ($warn_bytes) = $total_bytes - $warn * 1024;
++	if ($warn_type eq "P") {
++		$warn_bytes = $warn * $1 * $2 / 100;
++	}
++	my ($crit_bytes) = $total_bytes - $crit * 1024;
++	if ($crit_type eq "P") {
++		$crit_bytes = $crit * $1 * $2 / 100;
++	}
++
+ 
+ 	if (int($avail / 1024) > 0) {
+ 		$avail = int($avail / 1024);
+@@ -225,32 +238,37 @@ if (/\s*(\d*) blocks of size (\d*)\. (\d*) blocks available/) {
+ #print ":$warn:$warn_type:\n";
+ #print ":$crit:$crit_type:\n";
+ #print ":$avail:$avail_bytes:$capper:$mountpt:\n";
++	$perfdata = "'" . $share . "'=" . $occupied_bytes . 'B;'
++		. $warn_bytes . ';'
++		. $crit_bytes . ';'
++		. '0;'
++		. $total_bytes;
+ 
+-	if ((($warn_type eq "P") && (100 - $capper) < $warn) || (($warn_type eq "K") && ($avail_bytes > $warn))) { 
+-		$answer = "Disk ok - $avail ($capper%) free on $mountpt\n";
+-	} elsif ((($crit_type eq "P") && (100 - $capper) < $crit) || (($crit_type eq "K") && ($avail_bytes > $crit))) {
++	if ($occupied_bytes > $crit_bytes) {
++		$state = "CRITICAL";
++		$answer = "CRITICAL: Only $avail ($capper%) free on $mountpt";
++	} elsif ( $occupied_bytes > $warn_bytes ) {
+ 		$state = "WARNING";
+-		$answer = "WARNING: Only $avail ($capper%) free on $mountpt\n";
++		$answer = "WARNING: Only $avail ($capper%) free on $mountpt";
+ 	} else {
+-		$state = "CRITICAL";
+-		$answer = "CRITICAL: Only $avail ($capper%) free on $mountpt\n";
++		$answer = "Disk ok - $avail ($capper%) free on $mountpt";
+ 	}
+ } else {
+-	$answer = "Result from smbclient not suitable\n";
++	$answer = "Result from smbclient not suitable";
+ 	$state = "UNKNOWN";
+ 	foreach (@lines) {
+ 		if (/(Access denied|NT_STATUS_LOGON_FAILURE|NT_STATUS_ACCESS_DENIED)/) {
+-			$answer = "Access Denied\n";
++			$answer = "Access Denied";
+ 			$state = "CRITICAL";
+ 			last;
+ 		}
+ 		if (/(Unknown host \w*|Connection.*failed)/) {
+-			$answer = "$1\n";
++			$answer = "$1";
+ 			$state = "CRITICAL";
+ 			last;
+ 		}
+ 		if (/(You specified an invalid share name|NT_STATUS_BAD_NETWORK_NAME)/) {
+-			$answer = "Invalid share name \\\\$host\\$share\n";
++			$answer = "Invalid share name \\\\$host\\$share";
+ 			$state = "CRITICAL";
+ 			last;
+ 		}
+@@ -259,6 +277,8 @@ if (/\s*(\d*) blocks of size (\d*)\. (\d*) blocks available/) {
+ 
+ 
+ print $answer;
++print " | " . $perfdata if ($perfdata);
++print "\n";
+ print "$state\n" if ($verbose);
+ exit $ERRORS{$state};
+