X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_ntp.c;h=68c82d1154655907b4b7e8df8221d8b1de1e2594;hb=44f8455b2cf248c6f50c35bfc3510d2946084c5b;hp=a884c15ea9b486311708171147bec4eab8cb9592;hpb=05ef3c4bd9aabd8bf10e595b2d597958e46b897f;p=nagiosplug.git diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index a884c15..68c82d1 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c @@ -1,44 +1,41 @@ -/****************************************************************************** -* +/***************************************************************************** +* * Nagios check_ntp plugin -* +* * License: GPL -* Copyright (c) 2006 sean finney -* Copyright (c) 2006 nagios-plugins team -* +* Copyright (c) 2006 Sean Finney +* Copyright (c) 2006-2008 Nagios Plugins Development Team +* * Last Modified: $Date$ -* +* * Description: -* +* * This file contains the check_ntp plugin -* -* This plugin to check ntp servers independant of any commandline -* programs or external libraries. -* -* -* License Information: -* -* This program is free software; you can redistribute it and/or modify +* +* This plugin to check ntp servers independant of any commandline +* programs or external libraries. +* +* +* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or +* the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ - +* along with this program. If not, see . +* +* $Id$ +* *****************************************************************************/ const char *progname = "check_ntp"; const char *revision = "$Revision$"; -const char *copyright = "2006"; +const char *copyright = "2006-2008"; const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include "common.h" @@ -47,13 +44,16 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; static char *server_address=NULL; static int verbose=0; -static double owarn=60; -static double ocrit=120; +static short do_offset=0; +static char *owarn="60"; +static char *ocrit="120"; static short do_jitter=0; -static double jwarn=5000; -static double jcrit=10000; +static char *jwarn="5000"; +static char *jcrit="10000"; int process_arguments (int, char **); +thresholds *offset_thresholds = NULL; +thresholds *jitter_thresholds = NULL; void print_help (void); void print_usage (void); @@ -86,6 +86,7 @@ typedef struct { double rtdelay; /* converted from the ntp_message */ double rtdisp; /* converted from the ntp_message */ double offset[AVG_NUM]; /* offsets from each response */ + uint8_t flags; /* byte with leapindicator,vers,mode. see macros */ } ntp_server_results; /* this structure holds everything in an ntp control message as per rfc1305 */ @@ -298,44 +299,52 @@ void setup_request(ntp_message *p){ * this is done by filtering servers based on stratum, dispersion, and * finally round-trip delay. */ int best_offset_server(const ntp_server_results *slist, int nservers){ - int i=0, j=0, cserver=0, candidates[5], csize=0; + int i=0, cserver=0, best_server=-1; /* for each server */ for(cserver=0; cserveri; j--){ - candidates[j]=candidates[j-1]; - } + /* If we don't have a server yet, use the first one */ + if (best_server == -1) { + best_server = cserver; + DBG(printf("using peer %d as our first candidate\n", best_server)); + continue; } - /* regardless, if they should be on the list... */ - if(i<5) { - candidates[i]=cserver; - if(csize<5) csize++; - /* otherwise discard the server */ - } else { - DBG(printf("discarding peer id %d\n", cserver)); + + /* compare the server to the best one we've seen so far */ + /* does it have an equal or better stratum? */ + DBG(printf("comparing peer %d with peer %d\n", cserver, best_server)); + if(slist[cserver].stratum <= slist[best_server].stratum){ + DBG(printf("stratum for peer %d <= peer %d\n", cserver, best_server)); + /* does it have an equal or better dispersion? */ + if(slist[cserver].rtdisp <= slist[best_server].rtdisp){ + DBG(printf("dispersion for peer %d <= peer %d\n", cserver, best_server)); + /* does it have a better rtdelay? */ + if(slist[cserver].rtdelay < slist[best_server].rtdelay){ + DBG(printf("rtdelay for peer %d < peer %d\n", cserver, best_server)); + best_server = cserver; + DBG(printf("peer %d is now our best candidate\n", best_server)); + } + } } } - if(csize>0) { - DBG(printf("best server selected: peer %d\n", candidates[0])); - return candidates[0]; + if(best_server >= 0) { + DBG(printf("best server selected: peer %d\n", best_server)); + return best_server; } else { DBG(printf("no peers meeting synchronization criteria :(\n")); return -1; @@ -382,6 +391,7 @@ double offset_request(const char *host, int *status){ servers=(ntp_server_results*)malloc(sizeof(ntp_server_results)*num_hosts); if(servers==NULL) die(STATE_UNKNOWN, "can not allocate server array"); memset(servers, 0, sizeof(ntp_server_results)*num_hosts); + DBG(printf("Found %d peers to check\n", num_hosts)); /* setup each socket for writing, and the corresponding struct pollfd */ ai_tmp=ai; @@ -450,6 +460,7 @@ double offset_request(const char *host, int *status){ servers[i].rtdisp=NTP32asDOUBLE(req[i].rtdisp); servers[i].rtdelay=NTP32asDOUBLE(req[i].rtdelay); servers[i].waiting=0; + servers[i].flags=req[i].flags; servers_readable--; one_read = 1; if(servers[i].num_responses==AVG_NUM) servers_completed++; @@ -465,7 +476,7 @@ double offset_request(const char *host, int *status){ /* now, pick the best server from the list */ best_index=best_offset_server(servers, num_hosts); if(best_index < 0){ - *status=STATE_CRITICAL; + *status=STATE_UNKNOWN; } else { /* finally, calculate the average offset */ for(i=0; iwarning->end, + TRUE, offset_thresholds->critical->end, FALSE, 0, FALSE, 0); } char *perfd_jitter (double jitter) { return fperfdata ("jitter", jitter, "s", - do_jitter, jwarn, - do_jitter, jcrit, + do_jitter, jitter_thresholds->warning->end, + do_jitter, jitter_thresholds->critical->end, TRUE, 0, FALSE, 0); } @@ -752,11 +757,21 @@ int main(int argc, char *argv[]){ double offset=0, jitter=0; char *result_line, *perfdata_line; - result=offset_result=jitter_result=STATE_UNKNOWN; + setlocale (LC_ALL, ""); + bindtextdomain (PACKAGE, LOCALEDIR); + textdomain (PACKAGE); + + result = offset_result = jitter_result = STATE_OK; + + /* Parse extra opts if any */ + argv=np_extra_opts (&argc, argv, progname); if (process_arguments (argc, argv) == ERROR) usage4 (_("Could not parse arguments")); + set_thresholds(&offset_thresholds, owarn, ocrit); + set_thresholds(&jitter_thresholds, jwarn, jcrit); + /* initialize alarm signal handling */ signal (SIGALRM, socket_timeout_alarm_handler); @@ -764,14 +779,13 @@ int main(int argc, char *argv[]){ alarm (socket_timeout); offset = offset_request(server_address, &offset_result); - if(fabs(offset) > ocrit){ + /* check_ntp used to always return CRITICAL 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 if(fabs(offset) > owarn) { - result = STATE_WARNING; } else { - result = STATE_OK; + result = get_status(fabs(offset), offset_thresholds); } - result=max_state(result, offset_result); /* If not told to check the jitter, we don't even send packets. * jitter is checked using NTP control packets, which not all @@ -780,39 +794,33 @@ int main(int argc, char *argv[]){ */ if(do_jitter){ jitter=jitter_request(server_address, &jitter_result); - if(jitter > jcrit){ - result = max_state(result, STATE_CRITICAL); - } else if(jitter > jwarn) { - result = max_state(result, STATE_WARNING); - } else if(jitter == -1.0 && result == STATE_OK){ - /* -1 indicates that we couldn't calculate the jitter - * Only overrides STATE_OK from the offset */ + 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 : - asprintf(&result_line, "NTP CRITICAL:"); + asprintf(&result_line, _("NTP CRITICAL:")); break; case STATE_WARNING : - asprintf(&result_line, "NTP WARNING:"); + asprintf(&result_line, _("NTP WARNING:")); break; case STATE_OK : - asprintf(&result_line, "NTP OK:"); + asprintf(&result_line, _("NTP OK:")); break; default : - asprintf(&result_line, "NTP UNKNOWN:"); + asprintf(&result_line, _("NTP UNKNOWN:")); break; } - if(offset_result==STATE_CRITICAL){ + if(offset_result == STATE_UNKNOWN){ asprintf(&result_line, "%s %s", result_line, _("Offset unknown")); + asprintf(&perfdata_line, ""); } else { - if(offset_result==STATE_WARNING){ - asprintf(&result_line, "%s %s", result_line, _("Unable to fully sample sync server")); - } - asprintf(&result_line, "%s Offset %.10g secs", result_line, offset); + asprintf(&result_line, "%s %s %.10g secs", result_line, _("Offset"), offset); asprintf(&perfdata_line, "%s", perfd_offset(offset)); } if (do_jitter) { @@ -832,30 +840,54 @@ void print_help(void){ printf ("Copyright (c) 2006 Sean Finney\n"); printf (COPYRIGHT, copyright, email); - - printf ("%s\n", _("This plugin checks the selected ntp server")); - printf ("\n\n"); - + printf ("%s\n", _("This plugin checks the selected ntp server")); + + printf ("\n\n"); + print_usage(); printf (_(UT_HELP_VRSN)); + printf (_(UT_EXTRA_OPTS)); printf (_(UT_HOST_PORT), 'p', "123"); - printf (" %s\n", "-w, --warning=DOUBLE"); + printf (" %s\n", "-w, --warning=THRESHOLD"); printf (" %s\n", _("Offset to result in warning status (seconds)")); - printf (" %s\n", "-c, --critical=DOUBLE"); + printf (" %s\n", "-c, --critical=THRESHOLD"); printf (" %s\n", _("Offset to result in critical status (seconds)")); - printf (" %s\n", "-j, --warning=DOUBLE"); - printf (" %s\n", _("Warning value for jitter")); - printf (" %s\n", "-k, --critical=DOUBLE"); - printf (" %s\n", _("Critical value for jitter")); + printf (" %s\n", "-j, --jwarn=THRESHOLD"); + printf (" %s\n", _("Warning threshold for jitter")); + printf (" %s\n", "-k, --jcrit=THRESHOLD"); + printf (" %s\n", _("Critical threshold for jitter")); printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); printf (_(UT_VERBOSE)); + + printf("\n"); + printf("%s\n", _("Notes:")); + printf(_(UT_THRESHOLDS_NOTES)); +#ifdef NP_EXTRA_OPTS + printf("\n"); + printf(_(UT_EXTRA_OPTS_NOTES)); +#endif + + printf("\n"); + printf("%s\n", _("Examples:")); + printf(" %s\n", _("Normal offset check:")); + printf(" %s\n", ("./check_ntp -H ntpserv -w 0.5 -c 1")); + printf("\n"); + 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 (_(UT_SUPPORT)); + + printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or")); + printf ("%s\n\n", _("check_ntp_time istead.")); } void print_usage(void) { - printf (_("Usage:")); - printf("%s -H [-w ] [-c ] [-j ] [-k ] [-v verbose]\n", progname); + printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or")); + printf ("%s\n\n", _("check_ntp_time istead.")); + printf (_("Usage:")); + printf(" %s -H [-w ] [-c ] [-j ] [-k ] [-v verbose]\n", progname); }