upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-03-27 04:43:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed coredump from check_nt when drive not found (Olli Hauer - SF 2179754)

Browse source
This commit is contained in:
Ton Voon 2009-02-19 23:43:15 +00:00
parent b99afc69bf
commit 31efea1b49
4 changed files with 92 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -21,6 +21,7 @@ This file documents the major additions and syntax changes between releases.
Fixed check_mrtg returning UNKNOWN instead of OK (bug #2378068)
Fixed check_http behaviour: all check are now performed as long as a valid response is returned (sf.net #1460312)
check_http --onredirect=sticky follows using the same IP address (sf.net #2550208).
Fixed coredump from check_nt when invalid drive is specified (#2179754 - Olli Hauer)
1.4.13 25th Sept 2008
Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)

1
THANKS.in
View file

@ -245,3 +245,4 @@ Dieter Van de Walle
Jan Lipphaus
Erik Welch
Nik Soggia
Olli Hauer

20
plugins/check_nt.c
View file

@ -93,6 +93,7 @@ int main(int argc, char **argv){
char *temp_string_perf=NULL;
char *description=NULL,*counter_unit = NULL;
char *minval = NULL, *maxval = NULL, *errcvt = NULL;
char *fds=NULL, *tds=NULL;
double total_disk_space=0;
double free_disk_space=0;
@ -214,13 +215,18 @@ int main(int argc, char **argv){
else {
asprintf(&send_buffer,"%s&4&%s", req_password, value_list);
fetch_data (server_address, server_port, send_buffer);
free_disk_space=atof(strtok(recv_buffer,"&"));
total_disk_space=atof(strtok(NULL,"&"));
percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
warning_used_space = ((float)warning_value / 100) * total_disk_space;
critical_used_space = ((float)critical_value / 100) * total_disk_space;
fds=strtok(recv_buffer,"&");
tds=strtok(NULL,"&");
if(fds!=NULL)
free_disk_space=atof(fds);
if(tds!=NULL)
total_disk_space=atof(tds);
if (total_disk_space>0 && free_disk_space>=0) {
percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
warning_used_space = ((float)warning_value / 100) * total_disk_space;
critical_used_space = ((float)critical_value / 100) * total_disk_space;
if (free_disk_space>=0) {
asprintf(&temp_string,_("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"),
value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824,
percent_used_space, free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100);
@ -238,7 +244,7 @@ int main(int argc, char **argv){
output_message = strdup (temp_string);
perfdata = temp_string_perf;
} else {
output_message = strdup (_("Free disk space : Invalid drive "));
output_message = strdup (_("Free disk space : Invalid drive"));
return_code=STATE_UNKNOWN;
}
}

77
plugins/tests/check_nt.t Executable file
View file

@ -0,0 +1,77 @@
#! /usr/bin/perl -w -I ..
#
# Test check_nt by having a stub check_nt daemon
#
use strict;
use Test::More;
use NPTest;
use FindBin qw($Bin);
use IO::Socket;
use IO::Select;
use POSIX;
my $port = 50000 + int(rand(1000));
my $pid = fork();
if ($pid) {
# Parent
#print "parent\n";
# give our webserver some time to startup
sleep(1);
} else {
# Child
#print "child\n";
my $server = IO::Socket::INET->new(
LocalPort => $port,
Type => SOCK_STREAM,
Reuse => 1,
Proto => "tcp",
Listen => 10,
) or die "Cannot be a tcp server on port $port: $@";
$server->autoflush(1);
print "Please contact me at port $port\n";
while (my $client = $server->accept ) {
my $data = "";
my $rv = $client->recv($data, POSIX::BUFSIZ, 0);
my ($password, $command, $arg) = split('&', $data);
if ($command eq "4") {
if ($arg eq "c") {
print $client "930000000&1000000000";
} elsif ($arg eq "d") {
print $client "UNKNOWN: Drive is not a fixed drive";
}
}
}
exit;
}
END { if ($pid) { print "Killing $pid\n"; kill "INT", $pid } };
if ($ARGV[0] && $ARGV[0] eq "-d") {
sleep 1000;
}
if (-x "./check_nt") {
plan tests => 4;
} else {
plan skip_all => "No check_nt compiled";
}
my $result;
my $command = "./check_nt -H 127.0.0.1 -p $port";
$result = NPTest->testCmd( "$command -v USEDDISKSPACE -l c" );
is( $result->return_code, 0, "USEDDISKSPACE c");
is( $result->output, q{c:\ - total: 0.93 Gb - used: 0.07 Gb (7%) - free 0.87 Gb (93%) | 'c:\ Used Space'=0.07Gb;0.00;0.00;0.00;0.93}, "Output right" );
$result = NPTest->testCmd( "$command -v USEDDISKSPACE -l d" );
is( $result->return_code, 3, "USEDDISKSPACE d - invalid");
is( $result->output, "Free disk space : Invalid drive", "Output right" );