Verbose should not have to exceed 3 as per developement guidelines

[nagiosplug.git] / plugins / check_ntp_peer.c

diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 753b7b25b0a964d3e7af78793e719cfc64a39e42..67ee0a77a7079e720a6d335fadb576fc2ceed534 100644 (file)
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -552,6 +552,9 @@ int main(int argc, char *argv[]){
        bindtextdomain (PACKAGE, LOCALEDIR);
        textdomain (PACKAGE);
 
+       /* Parse extra opts if any */
+       argv=np_extra_opts (&argc, argv, progname);
+
        if (process_arguments (argc, argv) == ERROR)
                usage4 (_("Could not parse arguments"));
 
@@ -602,7 +605,7 @@ int main(int argc, char *argv[]){
                asprintf(&result_line, "%s %s,", result_line, _("Server not synchronized"));
        else if(li_alarm)
                asprintf(&result_line, "%s %s,", result_line, _("Server has the LI_ALARM bit set"));
- 
+
        if(offset_result == STATE_UNKNOWN){
                asprintf(&result_line, "%s %s", result_line, _("Offset unknown"));
                asprintf(&perfdata_line, "");
@@ -638,6 +641,7 @@ void print_help(void){
 
        print_usage();
        printf (_(UT_HELP_VRSN));
+       printf (_(UT_EXTRA_OPTS));
        printf (_(UT_HOST_PORT), 'p', "123");
        printf (" %s\n", "-q, --quiet");
        printf ("    %s\n", _("Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"));
@@ -645,37 +649,42 @@ 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", "-W, --swarn=THRESHOLD");
        printf ("    %s\n", _("Warning threshold for stratum"));
-       printf (" %s\n", "-C, --critical=THRESHOLD");
+       printf (" %s\n", "-C, --scrit=THRESHOLD");
        printf ("    %s\n", _("Critical threshold for stratum"));
-       printf (" %s\n", "-j, --warning=THRESHOLD");
+       printf (" %s\n", "-j, --jwarn=THRESHOLD");
        printf ("    %s\n", _("Warning threshold for jitter"));
-       printf (" %s\n", "-k, --critical=THRESHOLD");
+       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", _("This plugin checks an NTP server independent of any commandline"));
+       printf("%s\n\n", _("programs or external libraries."));
+
        printf("%s\n", _("Notes:"));
-       printf(" %s\n", _("This plugin checks an NTP server independent of any commandline"));
-       printf(" %s\n\n", _("programs or external libraries."));
        printf(" %s\n", _("Use this plugin to check the health of an NTP server. It supports"));
        printf(" %s\n", _("checking the offset with the sync peer, the jitter and stratum. This"));
        printf(" %s\n", _("plugin will not check the clock offset between the local host and NTP"));
-       printf(" %s\n\n", _("server; please use check_ntp_time for that purpose."));
-
-       printf(" %s\n", _("See:"));
-       printf(" %s\n", ("http://nagiosplug.sourceforge.net/developer-guidelines.html#THRESHOLDFORMAT"));
-       printf(" %s\n", _("for THRESHOLD format and examples."));
+       printf(" %s\n", _("server; please use check_ntp_time for that purpose."));
+       printf("\n");
+       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", _("Simple NTP server check:"));
        printf("  %s\n", ("./check_ntp_peer -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_peer -H ntpserv -w 0.5 -c 1 -j -1:100 -k -1:200"));
+       printf("\n");
        printf(" %s\n", _("Check only stratum:"));
        printf("  %s\n", ("./check_ntp_peer -H ntpserv -W 4 -C 6"));