diff options
author | Spenser Reinhardt <sreinhardt@nagios.com> | 2014-01-20 21:30:26 (GMT) |
---|---|---|
committer | Jan Wagner <waja@cyconet.org> | 2014-01-21 10:35:07 (GMT) |
commit | 66544851f7a4f5eeaf86d1cee8b1f54c76f98433 (patch) | |
tree | 73d010869dd41592e320bf8d50a20b84c8008550 | |
parent | 80e506a2f72b66dee5c607b4dd42b26f505762dd (diff) | |
download | monitoring-plugins-66544851f7a4f5eeaf86d1cee8b1f54c76f98433.tar.gz |
plugins/*.c: Non-network timeout changes
Changes to non-network checks for clarity on timeout value. Adapted from pull request #1209 tracker from user awiddersheim. (Closes: #1209)
Files: check_apt.c, check_disk.c, check_procs.c, negate.c
-rw-r--r-- | plugins/check_apt.c | 2 | ||||
-rw-r--r-- | plugins/check_disk.c | 2 | ||||
-rw-r--r-- | plugins/check_procs.c | 2 | ||||
-rw-r--r-- | plugins/negate.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/check_apt.c b/plugins/check_apt.c index fbba494..b7ae8f1 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c | |||
@@ -430,7 +430,7 @@ print_help (void) | |||
430 | printf(UT_HELP_VRSN); | 430 | printf(UT_HELP_VRSN); |
431 | printf(UT_EXTRA_OPTS); | 431 | printf(UT_EXTRA_OPTS); |
432 | 432 | ||
433 | printf(UT_CONN_TIMEOUT, timeout_interval); | 433 | printf(UT_PLUG_TIMEOUT, timeout_interval); |
434 | 434 | ||
435 | printf (" %s\n", "-U, --upgrade=OPTS"); | 435 | printf (" %s\n", "-U, --upgrade=OPTS"); |
436 | printf (" %s\n", _("[Default] Perform an upgrade. If an optional OPTS argument is provided,")); | 436 | printf (" %s\n", _("[Default] Perform an upgrade. If an optional OPTS argument is provided,")); |
diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 527caa9..05eb970 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c | |||
@@ -911,7 +911,7 @@ print_help (void) | |||
911 | printf (" %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)")); | 911 | printf (" %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)")); |
912 | printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION"); | 912 | printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION"); |
913 | printf (" %s\n", _("Regular expression to ignore selected path or partition (may be repeated)")); | 913 | printf (" %s\n", _("Regular expression to ignore selected path or partition (may be repeated)")); |
914 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 914 | printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
915 | printf (" %s\n", "-u, --units=STRING"); | 915 | printf (" %s\n", "-u, --units=STRING"); |
916 | printf (" %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)")); | 916 | printf (" %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)")); |
917 | printf (UT_VERBOSE); | 917 | printf (UT_VERBOSE); |
diff --git a/plugins/check_procs.c b/plugins/check_procs.c index 4646b8a..4ad2c42 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c | |||
@@ -715,7 +715,7 @@ print_help (void) | |||
715 | #if defined( __linux__ ) | 715 | #if defined( __linux__ ) |
716 | printf (" %s\n", _("ELAPSED - time elapsed in seconds")); | 716 | printf (" %s\n", _("ELAPSED - time elapsed in seconds")); |
717 | #endif /* defined(__linux__) */ | 717 | #endif /* defined(__linux__) */ |
718 | printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 718 | printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
719 | 719 | ||
720 | printf (" %s\n", "-v, --verbose"); | 720 | printf (" %s\n", "-v, --verbose"); |
721 | printf (" %s\n", _("Extra information. Up to 3 verbosity levels")); | 721 | printf (" %s\n", _("Extra information. Up to 3 verbosity levels")); |
diff --git a/plugins/negate.c b/plugins/negate.c index 4eddf24..67a386a 100644 --- a/plugins/negate.c +++ b/plugins/negate.c | |||
@@ -252,7 +252,7 @@ print_help (void) | |||
252 | 252 | ||
253 | printf (UT_HELP_VRSN); | 253 | printf (UT_HELP_VRSN); |
254 | 254 | ||
255 | printf (UT_CONN_TIMEOUT, timeout_interval); | 255 | printf (UT_PLUG_TIMEOUT, timeout_interval); |
256 | printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status.")); | 256 | printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status.")); |
257 | printf (" -T, --timeout-result=STATUS\n"); | 257 | printf (" -T, --timeout-result=STATUS\n"); |
258 | printf (" %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n")); | 258 | printf (" %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n")); |