diff options
-rw-r--r-- | plugins/check_apt.c | 2 | ||||
-rw-r--r-- | plugins/check_by_ssh.c | 2 | ||||
-rw-r--r-- | plugins/check_dbi.c | 2 | ||||
-rw-r--r-- | plugins/check_dig.c | 2 | ||||
-rw-r--r-- | plugins/check_disk.c | 2 | ||||
-rw-r--r-- | plugins/check_dns.c | 2 | ||||
-rw-r--r-- | plugins/check_game.c | 2 | ||||
-rw-r--r-- | plugins/check_http.c | 2 | ||||
-rw-r--r-- | plugins/check_ldap.c | 2 | ||||
-rw-r--r-- | plugins/check_ntp.c | 2 | ||||
-rw-r--r-- | plugins/check_ntp_peer.c | 2 | ||||
-rw-r--r-- | plugins/check_ntp_time.c | 2 | ||||
-rw-r--r-- | plugins/check_nwstat.c | 2 | ||||
-rw-r--r-- | plugins/check_overcr.c | 2 | ||||
-rw-r--r-- | plugins/check_pgsql.c | 2 | ||||
-rw-r--r-- | plugins/check_ping.c | 2 | ||||
-rw-r--r-- | plugins/check_procs.c | 2 | ||||
-rw-r--r-- | plugins/check_radius.c | 2 | ||||
-rw-r--r-- | plugins/check_real.c | 2 | ||||
-rw-r--r-- | plugins/check_smtp.c | 2 | ||||
-rw-r--r-- | plugins/check_snmp.c | 2 | ||||
-rw-r--r-- | plugins/check_ssh.c | 2 | ||||
-rw-r--r-- | plugins/check_tcp.c | 2 | ||||
-rw-r--r-- | plugins/check_time.c | 2 | ||||
-rw-r--r-- | plugins/check_ups.c | 2 | ||||
-rw-r--r-- | plugins/negate.c | 2 |
26 files changed, 26 insertions, 26 deletions
diff --git a/plugins/check_apt.c b/plugins/check_apt.c index daeb7578..fbba4945 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c @@ -430,7 +430,7 @@ print_help (void) printf(UT_HELP_VRSN); printf(UT_EXTRA_OPTS); - printf(UT_TIMEOUT, timeout_interval); + printf(UT_CONN_TIMEOUT, timeout_interval); printf (" %s\n", "-U, --upgrade=OPTS"); printf (" %s\n", _("[Default] Perform an upgrade. If an optional OPTS argument is provided,")); diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c index c5f0d529..9410fe2f 100644 --- a/plugins/check_by_ssh.c +++ b/plugins/check_by_ssh.c @@ -428,7 +428,7 @@ print_help (void) printf (" %s\n","-q, --quiet"); printf (" %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]")); printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); printf("\n"); printf (" %s\n", _("The most common mode of use is to refer to a local identity file with")); diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c index 8c4a511d..8bca31e5 100644 --- a/plugins/check_dbi.c +++ b/plugins/check_dbi.c @@ -562,7 +562,7 @@ print_help (void) printf (" %s\n", _("(ignore the query result)")); printf ("\n"); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_dig.c b/plugins/check_dig.c index c113d87b..9b9eee79 100644 --- a/plugins/check_dig.c +++ b/plugins/check_dig.c @@ -348,7 +348,7 @@ print_help (void) printf (" %s\n","-A, --dig-arguments=STRING"); printf (" %s\n",_("Pass STRING as argument(s) to dig")); printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); printf ("\n"); diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 04d588fb..527caa94 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c @@ -911,7 +911,7 @@ print_help (void) printf (" %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)")); printf (" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION"); printf (" %s\n", _("Regular expression to ignore selected path or partition (may be repeated)")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-u, --units=STRING"); printf (" %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)")); printf (UT_VERBOSE); diff --git a/plugins/check_dns.c b/plugins/check_dns.c index ac6cfc38..7e75ee4d 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c @@ -474,7 +474,7 @@ print_help (void) printf (" -c, --critical=seconds\n"); printf (" %s\n", _("Return critical if elapsed time exceeds value. Default off")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_SUPPORT); } diff --git a/plugins/check_game.c b/plugins/check_game.c index 89bb4b12..49da0bd8 100644 --- a/plugins/check_game.c +++ b/plugins/check_game.c @@ -312,7 +312,7 @@ print_help (void) printf (" %s\n", "-pf"); printf (" %s\n", _("Field number in raw qstat output that contains ping time")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf ("\n"); printf ("%s\n", _("Notes:")); diff --git a/plugins/check_http.c b/plugins/check_http.c index c36d916a..343654b5 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -1534,7 +1534,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index b05aca9a..649fd5aa 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c @@ -430,7 +430,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index 16be7c51..314bca85 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c @@ -858,7 +858,7 @@ void print_help(void){ 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_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); printf("\n"); diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c index 76152e17..7f9e27db 100644 --- a/plugins/check_ntp_peer.c +++ b/plugins/check_ntp_peer.c @@ -686,7 +686,7 @@ void print_help(void){ printf (" %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")")); printf (" %s\n", "-n, --tcrit=THRESHOLD"); printf (" %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); printf("\n"); diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c index bbcaa0ba..814bd7c3 100644 --- a/plugins/check_ntp_time.c +++ b/plugins/check_ntp_time.c @@ -614,7 +614,7 @@ 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 (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); printf("\n"); diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c index 6ebe8f83..f27849aa 100644 --- a/plugins/check_nwstat.c +++ b/plugins/check_nwstat.c @@ -1664,7 +1664,7 @@ void print_help(void) printf (" %s\n", "-o, --osversion"); printf (" %s\n", _("Include server version string in results")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf ("\n"); printf ("%s\n", _("Notes:")); diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c index 95977e91..78df1ab6 100644 --- a/plugins/check_overcr.c +++ b/plugins/check_overcr.c @@ -442,7 +442,7 @@ print_help (void) printf (" %s\n", _("NET<port> = number of active connections on TCP port <port>")); printf (" %s\n", _("UPTIME = system uptime in seconds")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c index 324bd5f4..e4f8202f 100644 --- a/plugins/check_pgsql.c +++ b/plugins/check_pgsql.c @@ -524,7 +524,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-q, --query=STRING"); printf (" %s\n", _("SQL query to run. Only first column in first row will be read")); diff --git a/plugins/check_ping.c b/plugins/check_ping.c index eef2195b..76543738 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c @@ -581,7 +581,7 @@ print_help (void) printf (" %s\n", "-L, --link"); printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf ("\n"); printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel")); diff --git a/plugins/check_procs.c b/plugins/check_procs.c index c2239dba..4646b8a8 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c @@ -715,7 +715,7 @@ print_help (void) #if defined( __linux__ ) printf (" %s\n", _("ELAPSED - time elapsed in seconds")); #endif /* defined(__linux__) */ - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-v, --verbose"); printf (" %s\n", _("Extra information. Up to 3 verbosity levels")); diff --git a/plugins/check_radius.c b/plugins/check_radius.c index e54105b0..2e439ef5 100644 --- a/plugins/check_radius.c +++ b/plugins/check_radius.c @@ -361,7 +361,7 @@ print_help (void) printf (" %s\n", "-r, --retries=INTEGER"); printf (" %s\n", _("Number of times to retry a failed connection")); - printf (UT_TIMEOUT, timeout_interval); + printf (UT_CONN_TIMEOUT, timeout_interval); printf ("\n"); printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections.")); diff --git a/plugins/check_real.c b/plugins/check_real.c index 18240f30..284ff299 100644 --- a/plugins/check_real.c +++ b/plugins/check_real.c @@ -429,7 +429,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index d477a51e..a67103ef 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c @@ -822,7 +822,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 52ad31ea..e15e8347 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c @@ -1160,7 +1160,7 @@ print_help (void) printf (" %s\n", "-D, --output-delimiter=STRING"); printf (" %s\n", _("Separates output on multiple OID requests")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-e, --retries=INTEGER"); printf (" %s\n", _("Number of retries to be used in the requests")); diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c index 6e8a5fc5..3712a3f4 100644 --- a/plugins/check_ssh.c +++ b/plugins/check_ssh.c @@ -291,7 +291,7 @@ print_help (void) printf (UT_IPv46); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (" %s\n", "-r, --remote-version=STRING"); printf (" %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)")); diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index 6ab82616..82562c46 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c @@ -670,7 +670,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_VERBOSE); diff --git a/plugins/check_time.c b/plugins/check_time.c index 7ee014e9..df3ce972 100644 --- a/plugins/check_time.c +++ b/plugins/check_time.c @@ -358,7 +358,7 @@ print_help (void) printf (" %s\n", "-C, --critical-connect=INTEGER"); printf (" %s\n", _("Response time (sec.) necessary to result in critical status")); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); printf (UT_SUPPORT); } diff --git a/plugins/check_ups.c b/plugins/check_ups.c index 59dcc264..4c03edd1 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -625,7 +625,7 @@ print_help (void) printf (UT_WARN_CRIT); - printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); /* TODO: -v clashing with -v/-variable. Commenting out help text since verbose is unused up to now */ diff --git a/plugins/negate.c b/plugins/negate.c index ef7d4e03..4eddf244 100644 --- a/plugins/negate.c +++ b/plugins/negate.c @@ -252,7 +252,7 @@ print_help (void) printf (UT_HELP_VRSN); - printf (UT_TIMEOUT, timeout_interval); + printf (UT_CONN_TIMEOUT, timeout_interval); printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status.")); printf (" -T, --timeout-result=STATUS\n"); printf (" %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n")); |