debian/pkg-monitoring-plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

add perfdata to check_disk_smb

Browse source
This commit is contained in:
Jan Wagner 2012-02-23 22:37:16 +00:00
parent 670f07c81d
commit 606f04878e
3 changed files with 105 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -9,6 +9,8 @@ nagios-plugins (1.4.15-6) UNRELEASED; urgency=low
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@cyconet.org> Wed, 07 Sep 2011 15:33:55 +0200

1
debian/patches/00list vendored
View file

@ -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

102
debian/patches/03_check_disk_smb_perfdata.dpatch vendored Normal file
View file

@ -0,0 +1,102 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_check_disk_smb_perfdata.dpatch by G. Leimua <gaufrettes.aumiel@gmail.com>
##
## DP: Add perfdata fo check_disk_smb (http://bugs.debian.org/654259)
@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};