summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthias Eble <psychotrahe@users.sourceforge.net>2007-12-10 00:19:27 (GMT)
committerMatthias Eble <psychotrahe@users.sourceforge.net>2007-12-10 00:19:27 (GMT)
commit3bb4b6b336b383c8f1686476cfb96ec674255683 (patch)
treed71cadec9e5e23765b8ae8ff1f31e3584766c460 /plugins
parent249bed27d5e064624d3590c98c15aa5401214ffa (diff)
downloadmonitoring-plugins-3bb4b6b336b383c8f1686476cfb96ec674255683.tar.gz
Fixed check_load argument handling when passing non triplet thresholds. Thanks to Jonathan Kamens (bug #1831890)
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1851 f882894a-f735-0410-b71e-b25c423dba1c
Diffstat (limited to 'plugins')
-rw-r--r--plugins/check_load.c4
-rw-r--r--plugins/t/check_load.t13
2 files changed, 13 insertions, 4 deletions
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 9de8ff7..5503204 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -77,6 +77,7 @@ static void
77get_threshold(char *arg, double *th) 77get_threshold(char *arg, double *th)
78{ 78{
79 size_t i, n; 79 size_t i, n;
80 int valid = 0;
80 char *str = arg, *p; 81 char *str = arg, *p;
81 82
82 n = strlen(arg); 83 n = strlen(arg);
@@ -84,12 +85,13 @@ get_threshold(char *arg, double *th)
84 th[i] = strtod(str, &p); 85 th[i] = strtod(str, &p);
85 if(p == str) break; 86 if(p == str) break;
86 87
88 valid = 1;
87 str = p + 1; 89 str = p + 1;
88 if(n <= (size_t)(str - arg)) break; 90 if(n <= (size_t)(str - arg)) break;
89 } 91 }
90 92
91 /* empty argument or non-floatish, so warn about it and die */ 93 /* empty argument or non-floatish, so warn about it and die */
92 if(!i) usage (_("Warning threshold must be float or float triplet!\n")); 94 if(!i && !valid) usage (_("Warning threshold must be float or float triplet!\n"));
93 95
94 if(i != 2) { 96 if(i != 2) {
95 /* one or more numbers were given, so fill array with last 97 /* one or more numbers were given, so fill array with last
diff --git a/plugins/t/check_load.t b/plugins/t/check_load.t
index da87d16..8987b84 100644
--- a/plugins/t/check_load.t
+++ b/plugins/t/check_load.t
@@ -11,10 +11,11 @@ use NPTest;
11 11
12my $res; 12my $res;
13 13
14my $successOutput = '/^OK - load average: [0-9]+\.?[0-9]+, [0-9]+\.?[0-9]+, [0-9]+\.?[0-9]+/'; 14my $loadValue = "[0-9]+\.?[0-9]+";
15my $failureOutput = '/^CRITICAL - load average: [0-9]+\.?[0-9]+, [0-9]+\.?[0-9]+, [0-9]+\.?[0-9]+/'; 15my $successOutput = "/^OK - load average: $loadValue, $loadValue, $loadValue/";
16my $failureOutput = "/^CRITICAL - load average: $loadValue, $loadValue, $loadValue/";
16 17
17plan tests => 6; 18plan tests => 11;
18 19
19$res = NPTest->testCmd( "./check_load -w 100,100,100 -c 100,100,100" ); 20$res = NPTest->testCmd( "./check_load -w 100,100,100 -c 100,100,100" );
20cmp_ok( $res->return_code, 'eq', 0, "load not over 100"); 21cmp_ok( $res->return_code, 'eq', 0, "load not over 100");
@@ -28,3 +29,9 @@ $res = NPTest->testCmd( "./check_load -r -w 0,0,0 -c 0,0,0" );
28cmp_ok( $res->return_code, 'eq', 2, "Load over 0 with per cpu division"); 29cmp_ok( $res->return_code, 'eq', 2, "Load over 0 with per cpu division");
29like( $res->output, $failureOutput, "Output OK"); 30like( $res->output, $failureOutput, "Output OK");
30 31
32$res = NPTest->testCmd( "./check_load -w 100 -c 100,110" );
33cmp_ok( $res->return_code, 'eq', 0, "Plugin can handle non-triplet-arguments");
34like( $res->output, $successOutput, "Output OK");
35like( $res->perf_output, "/load1=$loadValue;100.000;100.000/", "Test handling of non triplet thresholds (load1)");
36like( $res->perf_output, "/load5=$loadValue;100.000;110.000/", "Test handling of non triplet thresholds (load5)");
37like( $res->perf_output, "/load15=$loadValue;100.000;110.000/", "Test handling of non triplet thresholds (load15)");