summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Nierlein <sven@nierlein.de>2012-11-28 10:03:11 (GMT)
committerSven Nierlein <sven@nierlein.de>2012-11-28 10:03:11 (GMT)
commit24772e755e9d2a255e36eb2a97f545d2cb7ade3c (patch)
tree539d36018c186208829321ee7072fdacc18da0ef
parent668d8968ba6c36a37e01904e3083e279631edf32 (diff)
downloadmonitoring-plugins-24772e755e9d2a255e36eb2a97f545d2cb7ade3c.tar.gz
unified ipv4/6 usage and help text
-rw-r--r--plugins/check_ldap.c5
-rw-r--r--plugins/check_ntp.c3
-rw-r--r--plugins/check_ntp_peer.c3
-rw-r--r--plugins/check_ntp_time.c3
-rw-r--r--plugins/check_pgsql.c2
-rw-r--r--plugins/check_ssh.c2
6 files changed, 8 insertions, 10 deletions
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 65db851..b05aca9 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -445,11 +445,6 @@ print_help (void)
445 printf (UT_SUPPORT); 445 printf (UT_SUPPORT);
446} 446}
447 447
448/* todo
449* add option -4 and -6 to the long manual
450*
451*/
452
453void 448void
454print_usage (void) 449print_usage (void)
455{ 450{
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 76d19ba..7d18919 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -845,6 +845,7 @@ void print_help(void){
845 printf (UT_HELP_VRSN); 845 printf (UT_HELP_VRSN);
846 printf (UT_EXTRA_OPTS); 846 printf (UT_EXTRA_OPTS);
847 printf (UT_HOST_PORT, 'p', "123"); 847 printf (UT_HOST_PORT, 'p', "123");
848 printf (UT_IPv46);
848 printf (" %s\n", "-w, --warning=THRESHOLD"); 849 printf (" %s\n", "-w, --warning=THRESHOLD");
849 printf (" %s\n", _("Offset to result in warning status (seconds)")); 850 printf (" %s\n", _("Offset to result in warning status (seconds)"));
850 printf (" %s\n", "-c, --critical=THRESHOLD"); 851 printf (" %s\n", "-c, --critical=THRESHOLD");
@@ -881,5 +882,5 @@ print_usage(void)
881 printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or")); 882 printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or"));
882 printf ("%s\n\n", _("check_ntp_time instead.")); 883 printf ("%s\n\n", _("check_ntp_time instead."));
883 printf ("%s\n", _("Usage:")); 884 printf ("%s\n", _("Usage:"));
884 printf(" %s -H <host> [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-v verbose]\n", progname); 885 printf(" %s -H <host> [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-4|-6] [-v verbose]\n", progname);
885} 886}
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 50cb7b1..b59c056 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -660,6 +660,7 @@ void print_help(void){
660 print_usage(); 660 print_usage();
661 printf (UT_HELP_VRSN); 661 printf (UT_HELP_VRSN);
662 printf (UT_EXTRA_OPTS); 662 printf (UT_EXTRA_OPTS);
663 printf (UT_IPv46);
663 printf (UT_HOST_PORT, 'p', "123"); 664 printf (UT_HOST_PORT, 'p', "123");
664 printf (" %s\n", "-q, --quiet"); 665 printf (" %s\n", "-q, --quiet");
665 printf (" %s\n", _("Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized")); 666 printf (" %s\n", _("Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"));
@@ -716,6 +717,6 @@ void
716print_usage(void) 717print_usage(void)
717{ 718{
718 printf ("%s\n", _("Usage:")); 719 printf ("%s\n", _("Usage:"));
719 printf(" %s -H <host> [-w <warn>] [-c <crit>] [-W <warn>] [-C <crit>]\n", progname); 720 printf(" %s -H <host> [-4|-6] [-w <warn>] [-c <crit>] [-W <warn>] [-C <crit>]\n", progname);
720 printf(" [-j <warn>] [-k <crit>] [-v verbose]\n"); 721 printf(" [-j <warn>] [-k <crit>] [-v verbose]\n");
721} 722}
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index d543d6b..86530fe 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -602,6 +602,7 @@ void print_help(void){
602 print_usage(); 602 print_usage();
603 printf (UT_HELP_VRSN); 603 printf (UT_HELP_VRSN);
604 printf (UT_EXTRA_OPTS); 604 printf (UT_EXTRA_OPTS);
605 printf (UT_IPv46);
605 printf (UT_HOST_PORT, 'p', "123"); 606 printf (UT_HOST_PORT, 'p', "123");
606 printf (" %s\n", "-q, --quiet"); 607 printf (" %s\n", "-q, --quiet");
607 printf (" %s\n", _("Returns UNKNOWN instead of CRITICAL if offset cannot be found")); 608 printf (" %s\n", _("Returns UNKNOWN instead of CRITICAL if offset cannot be found"));
@@ -635,6 +636,6 @@ void
635print_usage(void) 636print_usage(void)
636{ 637{
637 printf ("%s\n", _("Usage:")); 638 printf ("%s\n", _("Usage:"));
638 printf(" %s -H <host> [-w <warn>] [-c <crit>] [-v verbose]\n", progname); 639 printf(" %s -H <host> [-4|-6] [-w <warn>] [-c <crit>] [-v verbose]\n", progname);
639} 640}
640 641
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 69edae7..8b0769f 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -475,6 +475,6 @@ void
475print_usage (void) 475print_usage (void)
476{ 476{
477 printf ("%s\n", _("Usage:")); 477 printf ("%s\n", _("Usage:"));
478 printf ("%s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n", progname); 478 printf ("%s [-H <host>] [-4|-6] [-P <port>] [-c <critical time>] [-w <warning time>]\n", progname);
479 printf (" [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n"); 479 printf (" [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n");
480} 480}
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 4d63394..6e8a5fc 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -307,6 +307,6 @@ void
307print_usage (void) 307print_usage (void)
308{ 308{
309 printf ("%s\n", _("Usage:")); 309 printf ("%s\n", _("Usage:"));
310 printf ("%s [-46] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname); 310 printf ("%s [-4|-6] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
311} 311}
312 312