From b5f11055dcef13a5c0b67207a291e1916036ca1f Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Tue, 4 Dec 2007 12:33:00 +0000 Subject: Merge more changes from trunk git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/branches/dermoth_ntp_rework@1845 f882894a-f735-0410-b71e-b25c423dba1c diff --git a/NEWS b/NEWS index 6200944..f2de153 100644 --- a/NEWS +++ b/NEWS @@ -3,12 +3,13 @@ This file documents the major additions and syntax changes between releases. 1.4.11 or 1.5 ?? Fix check_http regression in 1.4.10 where following redirects to relative URLs on virtual hosts failed if both "-H" and "-I" were used - Add stratum thresholds support to check_ntp (feature request #1703823) check_ntp now return UNKNOWN instead of WARNING if jitter is unavailable (jitter=-1.000000) as long as the thresholds range inculde -1. If no offset threshold is specified and the offset is unavailable, will return UNKNOWN as well. NOTE: If jitter thresholds are specified as integers it will return CRITICAL if jitter is "-1" as the default range starts at 0. See Examples in --help output. + Fix broken usage2 in check_snmp and check_cluster + check_cluster now accept all valid characters in its thresholds ("-", "@", "~") Merge two new checks that deprecates check_ntp: check_ntp_peer and check_ntp_time. You should read the --help output so see which one is suitable for you. check_ntp_peer implement stratum thresholds support (feature request #1703823). diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c index 703fff9..f1568d5 100644 --- a/plugins/check_cluster.c +++ b/plugins/check_cluster.c @@ -178,14 +178,10 @@ int process_arguments(int argc, char **argv){ break; case 'w': /* warning threshold */ - if (strspn (optarg, "0123456789:,") < strlen (optarg)) - usage2 (_("Invalid warning threshold: %s\n"), optarg); warn_threshold = strdup(optarg); break; case 'c': /* warning threshold */ - if (strspn (optarg, "0123456789:,") < strlen (optarg)) - usage2 (_("Invalid critical threshold: %s\n"), optarg); crit_threshold = strdup(optarg); break; diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 9fa4a60..c69e97a 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c @@ -521,7 +521,7 @@ process_arguments (int argc, char **argv) /* Test parameters */ case 'c': /* critical time threshold */ if (strspn (optarg, "0123456789:,") < strlen (optarg)) - usage2 (_("Invalid critical threshold: %s\n"), optarg); + usage2 (_("Invalid critical threshold"), optarg); for (ptr = optarg; ptr && jj < MAX_OIDS; jj++) { if (llu_getll (&lower_crit_lim[jj], ptr) == 1) eval_method[jj] |= CRIT_LT; @@ -532,7 +532,7 @@ process_arguments (int argc, char **argv) break; case 'w': /* warning time threshold */ if (strspn (optarg, "0123456789:,") < strlen (optarg)) - usage2 (_("Invalid warning threshold: %s\n"), optarg); + usage2 (_("Invalid warning threshold"), optarg); for (ptr = optarg; ptr && ii < MAX_OIDS; ii++) { if (llu_getll (&lower_warn_lim[ii], ptr) == 1) eval_method[ii] |= WARN_LT; -- cgit v0.10-9-g596f