Rename check_ntp* and merge change in Trunk

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/branches/dermoth_ntp_rework@1832 f882894a-f735-0410-b71e-b25c423dba1c

8 files changed, 56 insertions, 68 deletions

diff --git a/NEWS b/NEWS
index 99739a7..a0f3c56 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ This file documents the major additions and syntax changes between releases.
           and the offset is unavailable, will return UNKNOWN as well.
           NOTE: If jitter thresholds are specified integers it will return CRITICAL if jitter
           is "-1" as the default range starts at 0. See Examples in --help output.
+        YADDA YADDA YADDA... stratum thresholds support to check_ntp_peer (feature request #1703823)
 
 1.4.10 28th September 2007
         Fix check_http buffer overflow vulnerability when following HTTP redirects
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 782721a..eafcc5c 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -14,8 +14,8 @@ MATHLIBS = @MATHLIBS@
 #AM_CFLAGS = -Wall
 
 libexec_PROGRAMS = check_apt check_cluster check_disk check_dummy check_http check_load \
-        check_mrtg check_mrtgtraf check_ntp check_ntpd check_nwstat check_overcr check_ping \
-        check_real check_smtp check_ssh check_tcp check_time check_time_ntp \
+        check_mrtg check_mrtgtraf check_ntp check_ntp_peer check_nwstat check_overcr check_ping \
+        check_real check_smtp check_ssh check_tcp check_time check_ntp_time \
         check_ups check_users negate \
         urlize @EXTRAS@
 
@@ -70,7 +70,7 @@ check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS)
 check_nagios_LDADD = $(BASEOBJS) runcmd.o
 check_nt_LDADD = $(NETLIBS) 
 check_ntp_LDADD = $(NETLIBS) $(MATHLIBS)
-check_ntpd_LDADD = $(NETLIBS) $(MATHLIBS)
+check_ntp_peer_LDADD = $(NETLIBS) $(MATHLIBS)
 check_nwstat_LDADD = $(NETLIBS)
 check_overcr_LDADD = $(NETLIBS)
 check_pgsql_LDADD = $(NETLIBS) $(PGLIBS)
@@ -84,7 +84,7 @@ check_ssh_LDADD = $(NETLIBS)
 check_swap_LDADD = $(MATHLIBS) $(BASEOBJS) popen.o
 check_tcp_LDADD = $(SSLOBJS) $(NETLIBS) $(SSLLIBS)
 check_time_LDADD = $(NETLIBS)
-check_time_ntp_LDADD = $(NETLIBS) $(MATHLIBS)
+check_ntp_time_LDADD = $(NETLIBS) $(MATHLIBS)
 check_ups_LDADD = $(NETLIBS)
 check_users_LDADD = $(BASEOBJS) popen.o
 check_by_ssh_LDADD = $(NETLIBS) runcmd.o
@@ -112,7 +112,7 @@ check_mysql_query_DEPENDENCIES = check_mysql_query.c $(NETOBJS) $(DEPLIBS)
 check_nagios_DEPENDENCIES = check_nagios.c $(BASEOBJS) runcmd.o $(DEPLIBS)
 check_nt_DEPENDENCIES = check_nt.c $(NETOBJS) $(DEPLIBS)
 check_ntp_DEPENDENCIES = check_ntp.c $(NETOBJS) $(DEPLIBS)
-check_ntpd_DEPENDENCIES = check_ntpd.c $(NETOBJS) $(DEPLIBS)
+check_ntp_peer_DEPENDENCIES = check_ntp_peer.c $(NETOBJS) $(DEPLIBS)
 check_nwstat_DEPENDENCIES = check_nwstat.c $(NETOBJS) $(DEPLIBS)
 check_overcr_DEPENDENCIES = check_overcr.c $(NETOBJS) $(DEPLIBS)
 check_pgsql_DEPENDENCIES = check_pgsql.c $(NETOBJS)  $(DEPLIBS)
@@ -126,7 +126,7 @@ check_ssh_DEPENDENCIES = check_ssh.c $(NETOBJS) $(DEPLIBS)
 check_swap_DEPENDENCIES = check_swap.c $(BASEOBJS) popen.o $(DEPLIBS)
 check_tcp_DEPENDENCIES = check_tcp.c $(SSLOBJS) $(NETOBJS) $(DEPLIBS)
 check_time_DEPENDENCIES = check_time.c $(NETOBJS) $(DEPLIBS)
-check_time_ntp_DEPENDENCIES = check_time_ntp.c $(NETOBJS) $(DEPLIBS)
+check_ntp_time_DEPENDENCIES = check_ntp_time.c $(NETOBJS) $(DEPLIBS)
 check_ups_DEPENDENCIES = check_ups.c $(NETOBJS) $(DEPLIBS)
 check_users_DEPENDENCIES = check_users.c $(BASEOBJS) popen.o $(DEPLIBS)
 check_by_ssh_DEPENDENCIES = check_by_ssh.c $(NETOBJS) runcmd.o $(DEPLIBS)
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index df6e02f..38562ac 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -50,9 +50,6 @@ static int verbose=0;
 static short do_offset=0;
 static char *owarn="60";
 static char *ocrit="120";
-static short do_stratum=0;
-static char *swarn="16";
-static char *scrit="16";
 static short do_jitter=0;
 static char *jwarn="5000";
 static char *jcrit="10000";
@@ -60,7 +57,6 @@ static char *jcrit="10000";
 int process_arguments (int, char **);
 thresholds *offset_thresholds = NULL;
 thresholds *jitter_thresholds = NULL;
-thresholds *stratum_thresholds = NULL;
 void print_help (void);
 void print_usage (void);
 
@@ -361,7 +357,7 @@ int best_offset_server(const ntp_server_results *slist, int nservers){
  *   we don't waste time sitting around waiting for single packets. 
  * - we also "manually" handle resolving host names and connecting, because
  *   we have to do it in a way that our lazy macros don't handle currently :( */
-double offset_request(const char *host, int *stratum, int *status){
+double offset_request(const char *host, int *status){
         int i=0, j=0, ga_result=0, num_hosts=0, *socklist=NULL, respnum=0;
         int servers_completed=0, one_written=0, one_read=0, servers_readable=0, best_index=-1;
         time_t now_time=0, start_ts=0;
@@ -458,7 +454,7 @@ double offset_request(const char *host, int *stratum, int *status){
                                 respnum=servers[i].num_responses++;
                                 servers[i].offset[respnum]=calc_offset(&req[i], &recv_time);
                                 if(verbose) {
-                                        printf("offset %.10g, stratum %i\n", servers[i].offset[respnum], req[i].stratum);
+                                        printf("offset %.10g\n", servers[i].offset[respnum]);
                                 }
                                 servers[i].stratum=req[i].stratum;
                                 servers[i].rtdisp=NTP32asDOUBLE(req[i].rtdisp);
@@ -487,7 +483,6 @@ double offset_request(const char *host, int *stratum, int *status){
                         avg_offset+=servers[best_index].offset[j];
                 }
                 avg_offset/=servers[best_index].num_responses;
-                *stratum = servers[best_index].stratum;
         }
 
         /* cleanup */
@@ -665,8 +660,6 @@ int process_arguments(int argc, char **argv){
                 {"use-ipv6", no_argument, 0, '6'},
                 {"warning", required_argument, 0, 'w'},
                 {"critical", required_argument, 0, 'c'},
-                {"swarn", required_argument, 0, 'W'},
-                {"scrit", required_argument, 0, 'C'},
                 {"jwarn", required_argument, 0, 'j'},
                 {"jcrit", required_argument, 0, 'k'},
                 {"timeout", required_argument, 0, 't'},
@@ -679,7 +672,7 @@ int process_arguments(int argc, char **argv){
                 usage ("\n");
 
         while (1) {
-                c = getopt_long (argc, argv, "Vhv46w:c:W:C:j:k:t:H:", longopts, &option);
+                c = getopt_long (argc, argv, "Vhv46w:c:j:k:t:H:", longopts, &option);
                 if (c == -1 || c == EOF || c == 1)
                         break;
 
@@ -703,14 +696,6 @@ int process_arguments(int argc, char **argv){
                         do_offset=1;
                         ocrit = optarg;
                         break;
-                case 'W':
-                        do_stratum=1;
-                        swarn = optarg;
-                        break;
-                case 'C':
-                        do_stratum=1;
-                        scrit = optarg;
-                        break;
                 case 'j':
                         do_jitter=1;
                         jwarn = optarg;
@@ -767,16 +752,8 @@ char *perfd_jitter (double jitter)
                 TRUE, 0, FALSE, 0);
 }
 
-char *perfd_stratum (int stratum)
-{
-        return perfdata ("stratum", stratum, "",
-                do_stratum, (int)stratum_thresholds->warning->end,
-                do_stratum, (int)stratum_thresholds->critical->end,
-                TRUE, 0, TRUE, 16);
-}
-
 int main(int argc, char *argv[]){
-        int result, offset_result, jitter_result, stratum;
+        int result, offset_result, jitter_result;
         double offset=0, jitter=0;
         char *result_line, *perfdata_line;
 
@@ -787,7 +764,6 @@ int main(int argc, char *argv[]){
 
         set_thresholds(&offset_thresholds, owarn, ocrit);
         set_thresholds(&jitter_thresholds, jwarn, jcrit);
-        set_thresholds(&stratum_thresholds, swarn, scrit);
 
         /* initialize alarm signal handling */
         signal (SIGALRM, socket_timeout_alarm_handler);
@@ -795,15 +771,14 @@ int main(int argc, char *argv[]){
         /* set socket timeout */
         alarm (socket_timeout);
 
-        offset = offset_request(server_address, &stratum, &offset_result);
+        offset = offset_request(server_address, &offset_result);
+        /* check_ntp used to always return if offset_result == STATE_UNKNOWN.
+         * Now we'll only do that is the offset thresholds were set */
         if (do_offset && offset_result == STATE_UNKNOWN) {
                 result = STATE_CRITICAL;
         } else {
                 result = get_status(fabs(offset), offset_thresholds);
         }
-        result = max_state(result, offset_result);
-        if(do_stratum)
-                result = max_state(result, get_status(stratum, stratum_thresholds));
 
         /* If not told to check the jitter, we don't even send packets.
          * jitter is checked using NTP control packets, which not all
@@ -812,13 +787,13 @@ int main(int argc, char *argv[]){
          */
         if(do_jitter){
                 jitter=jitter_request(server_address, &jitter_result);
-                result = max_state(result, get_status(jitter, jitter_thresholds));
+                result = max_state_alt(result, get_status(jitter, jitter_thresholds));
                 /* -1 indicates that we couldn't calculate the jitter
                  * Only overrides STATE_OK from the offset */
                 if(jitter == -1.0 && result == STATE_OK)
                         result = STATE_UNKNOWN;
         }
-        result = max_state(result, jitter_result);
+        result = max_state_alt(result, jitter_result);
 
         switch (result) {
                 case STATE_CRITICAL :
@@ -838,11 +813,6 @@ int main(int argc, char *argv[]){
                 asprintf(&result_line, "%s %s", result_line, _("Offset unknown"));
                 asprintf(&perfdata_line, "");
         } else {
-#if 0           /* 2007-10-25 This can't happen. Leftovers or uninplemented? */
-                if(offset_result==STATE_WARNING){
-                        asprintf(&result_line, "%s %s", result_line, _("Unable to fully sample sync server"));
-                }
-#endif
                 asprintf(&result_line, "%s Offset %.10g secs", result_line, offset);
                 asprintf(&perfdata_line, "%s", perfd_offset(offset));
         }
@@ -850,10 +820,6 @@ int main(int argc, char *argv[]){
                 asprintf(&result_line, "%s, jitter=%f", result_line, jitter);
                 asprintf(&perfdata_line, "%s %s", perfdata_line,  perfd_jitter(jitter));
         }
-        if (do_stratum) {
-                asprintf(&result_line, "%s, stratum=%i", result_line, stratum);
-                asprintf(&perfdata_line, "%s %s", perfdata_line,  perfd_stratum(stratum));
-        }
         printf("%s|%s\n", result_line, perfdata_line);
 
         if(server_address!=NULL) free(server_address);
@@ -879,10 +845,6 @@ void print_help(void){
         printf ("    %s\n", _("Offset to result in warning status (seconds)"));
         printf (" %s\n", "-c, --critical=THRESHOLD");
         printf ("    %s\n", _("Offset to result in critical status (seconds)"));
-        printf (" %s\n", "-W, --warning=THRESHOLD");
-        printf ("    %s\n", _("Warning threshold for stratum"));
-        printf (" %s\n", "-W, --critical=THRESHOLD");
-        printf ("    %s\n", _("Critical threshold for stratum"));
         printf (" %s\n", "-j, --warning=THRESHOLD");
         printf ("    %s\n", _("Warning threshold for jitter"));
         printf (" %s\n", "-k, --critical=THRESHOLD");
@@ -903,8 +865,6 @@ void print_help(void){
         printf(" %s\n", _("Check jitter too, avoiding critical notifications if jitter isn't available"));
         printf(" %s\n", _("(See Notes above for more details on thresholds formats):"));
         printf("  %s\n", ("./check_ntp -H ntpserv -w 0.5 -c 1 -j -1:100 -k -1:200"));
-        printf(" %s\n", _("Check only stratum:"));
-        printf("  %s\n", ("./check_ntp -H ntpserv -W 4 -C 6"));
 
         printf (_(UT_SUPPORT));
 }
@@ -913,6 +873,5 @@ void
 print_usage(void)
 {
   printf (_("Usage:"));
-  printf(" %s -H <host> [-w <warn>] [-c <crit>] [-W <warn>] [-C <crit>]\n", progname);
-  printf("       [-j <warn>] [-k <crit>] [-v verbose]\n");
+  printf(" %s -H <host> [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-v verbose]\n", progname);
 }
diff --git a/plugins/check_ntpd.c b/plugins/check_ntp_peer.c
index 840fe0a..840fe0a 100644
--- a/plugins/check_ntpd.c
+++ b/plugins/check_ntp_peer.c
diff --git a/plugins/check_time_ntp.c b/plugins/check_ntp_time.c
index c945076..c945076 100644
--- a/plugins/check_time_ntp.c
+++ b/plugins/check_ntp_time.c
diff --git a/plugins/t/check_ntp.t b/plugins/t/check_ntp.t
index a36a730..e7eb0c4 100644
--- a/plugins/t/check_ntp.t
+++ b/plugins/t/check_ntp.t
@@ -9,8 +9,8 @@ use strict;
 use Test::More;
 use NPTest;
 
-my @PLUGINS1 = ('check_ntp', 'check_ntpd', 'check_time_ntp');
-my @PLUGINS2 = ('check_ntp', 'check_ntpd');
+my @PLUGINS1 = ('check_ntp', 'check_ntp_peer', 'check_ntp_time');
+my @PLUGINS2 = ('check_ntp_peer');
 
 plan tests => (9 * scalar(@PLUGINS1)) + (6 * scalar(@PLUGINS2));
 
@@ -45,19 +45,19 @@ foreach my $plugin (@PLUGINS1) {
                 $res = NPTest->testCmd(
                         "./$plugin -H $ntp_service -w 1000 -c 2000"
                         );
-                cmp_ok( $res->return_code, '==', 0, "Got good NTP result");
+                cmp_ok( $res->return_code, '==', 0, "$plugin: Got good NTP result");
                 like( $res->output, $ntp_okmatch1, "Output OK" );
 
                 $res = NPTest->testCmd(
                         "./$plugin -H $ntp_service -w 1000: -c 2000"
                         );
-                cmp_ok( $res->return_code, '==', 1, "Got warning NTP result");
+                cmp_ok( $res->return_code, '==', 1, "$plugin: Got warning NTP result");
                 like( $res->output, $ntp_warnmatch1, "Output WARNING" );
 
                 $res = NPTest->testCmd(
                         "./$plugin -H $ntp_service -w 1000 -c 2000:"
                         );
-                cmp_ok( $res->return_code, '==', 2, "Got critical NTP result");
+                cmp_ok( $res->return_code, '==', 2, "$plugin: Got critical NTP result");
                 like( $res->output, $ntp_critmatch1, "Output CRITICAL" );
         }
 
@@ -66,18 +66,18 @@ foreach my $plugin (@PLUGINS1) {
                 $res = NPTest->testCmd(
                         "./$plugin -H $no_ntp_service"
                         );
-                cmp_ok( $res->return_code, '==', 2, "Got bad NTP result");
+                cmp_ok( $res->return_code, '==', 2, "$plugin: Got bad NTP result");
         }
 
         $res = NPTest->testCmd(
                 "./$plugin -H $host_nonresponsive"
                 );
-        cmp_ok( $res->return_code, '==', 2, "Got critical if server not responding");
+        cmp_ok( $res->return_code, '==', 2, "$plugin: Got critical if server not responding");
 
         $res = NPTest->testCmd(
                 "./$plugin -H $hostname_invalid"
                 );
-        cmp_ok( $res->return_code, '==', 3, "Got critical if server hostname invalid");
+        cmp_ok( $res->return_code, '==', 3, "$plugin: Got critical if server hostname invalid");
 
 }
 
@@ -87,19 +87,19 @@ foreach my $plugin (@PLUGINS2) {
                 $res = NPTest->testCmd(
                         "./$plugin -H $ntp_service -w 1000 -c 2000 -W 20 -C 21 -j 100000 -k 200000"
                         );
-                cmp_ok( $res->return_code, '==', 0, "Got good NTP result");
+                cmp_ok( $res->return_code, '==', 0, "$plugin: Got good NTP result");
                 like( $res->output, $ntp_okmatch2, "Output OK" );
 
                 $res = NPTest->testCmd(
                         "./$plugin -H $ntp_service -w 1000 -c 2000 -W ~:-1 -C 21 -j 100000 -k 200000"
                         );
-                cmp_ok( $res->return_code, '==', 1, "Got warning NTP result");
+                cmp_ok( $res->return_code, '==', 1, "$plugin: Got warning NTP result");
                 like( $res->output, $ntp_warnmatch2, "Output WARNING" );
 
                 $res = NPTest->testCmd(
                         "./$plugin -H $ntp_service -w 1000 -c 2000 -W 20 -C 21 -j 100000 -k ~:-1"
                         );
-                cmp_ok( $res->return_code, '==', 2, "Got critical NTP result");
+                cmp_ok( $res->return_code, '==', 2, "$plugin: Got critical NTP result");
                 like( $res->output, $ntp_critmatch2, "Output CRITICAL" );
         }
 }
diff --git a/plugins/utils.c b/plugins/utils.c
index 0e79fbd..88b4411 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -53,6 +53,33 @@ max_state (int a, int b)
                 return max (a, b);
 }
 
+/* **************************************************************************
+ * max_state_alt(STATE_x, STATE_y)
+ * compares STATE_x to  STATE_y and returns result based on the following
+ * STATE_OK < STATE_DEPENDENT < STATE_UNKNOWN < STATE_WARNING < STATE_CRITICAL
+ *
+ * The main difference between max_state_alt and max_state it that it doesn't
+ * allow setting a default to UNKNOWN. It will instead prioritixe any valid
+ * non-OK state.
+ ****************************************************************************/
+
+int
+max_state_alt (int a, int b)
+{
+        if (a == STATE_CRITICAL || b == STATE_CRITICAL)
+                return STATE_CRITICAL;
+        else if (a == STATE_WARNING || b == STATE_WARNING)
+                return STATE_WARNING;
+        else if (a == STATE_UNKNOWN || b == STATE_UNKNOWN)
+                return STATE_UNKNOWN;
+        else if (a == STATE_DEPENDENT || b == STATE_DEPENDENT)
+                return STATE_DEPENDENT;
+        else if (a == STATE_OK || b == STATE_OK)
+                return STATE_OK;
+        else
+                return max (a, b);
+}
+
 void usage (const char *msg)
 {
         printf ("%s\n", msg);
diff --git a/plugins/utils.h b/plugins/utils.h
index f15a7b1..bb99ee1 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -76,6 +76,7 @@ char *strpcpy (char *, const char *, const char *);
 char *strpcat (char *, const char *, const char *);
 
 int max_state (int a, int b);
+int max_state_alt (int a, int b);
 
 void usage (const char *) __attribute__((noreturn));
 void usage2(const char *, const char *) __attribute__((noreturn));