2 files changed, 117 insertions, 12 deletions

diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index 6783543b..43841c36 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};
 
diff --git a/plugins-scripts/utils.sh.in b/plugins-scripts/utils.sh.in
index b30b9083..5fae6adb 100644
--- a/plugins-scripts/utils.sh.in
+++ b/plugins-scripts/utils.sh.in
@@ -21,3 +21,88 @@ support() {
         $ECHO "@SUPPORT@" | sed -e 's/\n/ /g'
 }
 
+#
+# check_range takes a value and a range string, returning successfully if an
+# alert should be raised based on the range.
+#
+check_range() {
+        local v range yes no err decimal start end cmp match
+        v="$1"
+        range="$2"
+
+        # whether to raise an alert or not
+        yes=0
+        no=1
+        err=2
+
+        # regex to match a decimal number
+        decimal="-?([0-9]+\.?[0-9]*|[0-9]*\.[0-9]+)"
+
+        # compare numbers (including decimals), returning true/false
+        cmp() { awk "BEGIN{ if ($1) exit(0); exit(1)}"; }
+
+        # returns successfully if the string in the first argument matches the
+        # regex in the second
+        match() { echo "$1" | grep -E -q -- "$2"; }
+
+        # make sure value is valid
+        if ! match "$v" "^$decimal$"; then
+                echo "${0##*/}: check_range: invalid value" >&2
+                unset -f cmp match
+                return "$err"
+        fi
+
+        # make sure range is valid
+        if ! match "$range" "^@?(~|$decimal)(:($decimal)?)?$"; then
+                echo "${0##*/}: check_range: invalid range" >&2
+                unset -f cmp match
+                return "$err"
+        fi
+
+        # check for leading @ char, which negates the range
+        if match $range '^@'; then
+                range=${range#@}
+                yes=1
+                no=0
+        fi
+
+        # parse the range string
+        if ! match "$range" ':'; then
+                start=0
+                end="$range"
+        else
+                start="${range%%:*}"
+                end="${range#*:}"
+        fi
+
+        # do the comparison, taking positive ("") and negative infinity ("~")
+        # into account
+        if [ "$start" != "~" ] && [ "$end" != "" ]; then
+                if cmp "$start <= $v" && cmp "$v <= $end"; then
+                        unset -f cmp match
+                        return "$no"
+                else
+                        unset -f cmp match
+                        return "$yes"
+                fi
+        elif [ "$start" != "~" ] && [ "$end" = "" ]; then
+                if cmp "$start <= $v"; then
+                        unset -f cmp match
+                        return "$no"
+                else
+                        unset -f cmp match
+                        return "$yes"
+                fi
+        elif [ "$start" = "~" ] && [ "$end" != "" ]; then
+                if cmp "$v <= $end"; then
+                        unset -f cmp match
+                        return "$no"
+                else
+                        unset -f cmp match
+                        return "$yes"
+                fi
+        else
+                unset -f cmp match
+                return "$no"
+        fi
+}