summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/check_apt.c2
-rw-r--r--plugins/check_by_ssh.c2
-rw-r--r--plugins/check_dbi.c2
-rw-r--r--plugins/check_dig.c2
-rw-r--r--plugins/check_disk.c2
-rw-r--r--plugins/check_dns.c2
-rw-r--r--plugins/check_game.c2
-rw-r--r--plugins/check_http.c2
-rw-r--r--plugins/check_ldap.c2
-rw-r--r--plugins/check_ntp.c2
-rw-r--r--plugins/check_ntp_peer.c2
-rw-r--r--plugins/check_ntp_time.c2
-rw-r--r--plugins/check_nwstat.c2
-rw-r--r--plugins/check_overcr.c2
-rw-r--r--plugins/check_pgsql.c2
-rw-r--r--plugins/check_ping.c2
-rw-r--r--plugins/check_procs.c2
-rw-r--r--plugins/check_radius.c2
-rw-r--r--plugins/check_real.c2
-rw-r--r--plugins/check_smtp.c2
-rw-r--r--plugins/check_snmp.c2
-rw-r--r--plugins/check_ssh.c2
-rw-r--r--plugins/check_tcp.c2
-rw-r--r--plugins/check_time.c2
-rw-r--r--plugins/check_ups.c2
-rw-r--r--plugins/negate.c2
26 files changed, 26 insertions, 26 deletions
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index daeb757..fbba494 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_TIMEOUT, timeout_interval); 433 printf(UT_CONN_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_by_ssh.c b/plugins/check_by_ssh.c
index c5f0d52..9410fe2 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -428,7 +428,7 @@ print_help (void)
428 printf (" %s\n","-q, --quiet"); 428 printf (" %s\n","-q, --quiet");
429 printf (" %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]")); 429 printf (" %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]"));
430 printf (UT_WARN_CRIT); 430 printf (UT_WARN_CRIT);
431 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 431 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
432 printf (UT_VERBOSE); 432 printf (UT_VERBOSE);
433 printf("\n"); 433 printf("\n");
434 printf (" %s\n", _("The most common mode of use is to refer to a local identity file with")); 434 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 8c4a511..8bca31e 100644
--- a/plugins/check_dbi.c
+++ b/plugins/check_dbi.c
@@ -562,7 +562,7 @@ print_help (void)
562 printf (" %s\n", _("(ignore the query result)")); 562 printf (" %s\n", _("(ignore the query result)"));
563 printf ("\n"); 563 printf ("\n");
564 564
565 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 565 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
566 566
567 printf (UT_VERBOSE); 567 printf (UT_VERBOSE);
568 568
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index c113d87..9b9eee7 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -348,7 +348,7 @@ print_help (void)
348 printf (" %s\n","-A, --dig-arguments=STRING"); 348 printf (" %s\n","-A, --dig-arguments=STRING");
349 printf (" %s\n",_("Pass STRING as argument(s) to dig")); 349 printf (" %s\n",_("Pass STRING as argument(s) to dig"));
350 printf (UT_WARN_CRIT); 350 printf (UT_WARN_CRIT);
351 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 351 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
352 printf (UT_VERBOSE); 352 printf (UT_VERBOSE);
353 353
354 printf ("\n"); 354 printf ("\n");
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 04d588f..527caa9 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_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 914 printf (UT_CONN_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_dns.c b/plugins/check_dns.c
index ac6cfc3..7e75ee4 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -474,7 +474,7 @@ print_help (void)
474 printf (" -c, --critical=seconds\n"); 474 printf (" -c, --critical=seconds\n");
475 printf (" %s\n", _("Return critical if elapsed time exceeds value. Default off")); 475 printf (" %s\n", _("Return critical if elapsed time exceeds value. Default off"));
476 476
477 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 477 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
478 478
479 printf (UT_SUPPORT); 479 printf (UT_SUPPORT);
480} 480}
diff --git a/plugins/check_game.c b/plugins/check_game.c
index 89bb4b1..49da0bd 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -312,7 +312,7 @@ print_help (void)
312 printf (" %s\n", "-pf"); 312 printf (" %s\n", "-pf");
313 printf (" %s\n", _("Field number in raw qstat output that contains ping time")); 313 printf (" %s\n", _("Field number in raw qstat output that contains ping time"));
314 314
315 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 315 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
316 316
317 printf ("\n"); 317 printf ("\n");
318 printf ("%s\n", _("Notes:")); 318 printf ("%s\n", _("Notes:"));
diff --git a/plugins/check_http.c b/plugins/check_http.c
index c36d916..343654b 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -1534,7 +1534,7 @@ print_help (void)
1534 1534
1535 printf (UT_WARN_CRIT); 1535 printf (UT_WARN_CRIT);
1536 1536
1537 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 1537 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
1538 1538
1539 printf (UT_VERBOSE); 1539 printf (UT_VERBOSE);
1540 1540
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index b05aca9..649fd5a 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -430,7 +430,7 @@ print_help (void)
430 430
431 printf (UT_WARN_CRIT); 431 printf (UT_WARN_CRIT);
432 432
433 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 433 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
434 434
435 printf (UT_VERBOSE); 435 printf (UT_VERBOSE);
436 436
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
index 16be7c5..314bca8 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -858,7 +858,7 @@ void print_help(void){
858 printf (" %s\n", _("Warning threshold for jitter")); 858 printf (" %s\n", _("Warning threshold for jitter"));
859 printf (" %s\n", "-k, --jcrit=THRESHOLD"); 859 printf (" %s\n", "-k, --jcrit=THRESHOLD");
860 printf (" %s\n", _("Critical threshold for jitter")); 860 printf (" %s\n", _("Critical threshold for jitter"));
861 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 861 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
862 printf (UT_VERBOSE); 862 printf (UT_VERBOSE);
863 863
864 printf("\n"); 864 printf("\n");
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 76152e1..7f9e27d 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -686,7 +686,7 @@ void print_help(void){
686 printf (" %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")")); 686 printf (" %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")"));
687 printf (" %s\n", "-n, --tcrit=THRESHOLD"); 687 printf (" %s\n", "-n, --tcrit=THRESHOLD");
688 printf (" %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")")); 688 printf (" %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")"));
689 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 689 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
690 printf (UT_VERBOSE); 690 printf (UT_VERBOSE);
691 691
692 printf("\n"); 692 printf("\n");
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index bbcaa0b..814bd7c 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -614,7 +614,7 @@ void print_help(void){
614 printf (" %s\n", _("Offset to result in warning status (seconds)")); 614 printf (" %s\n", _("Offset to result in warning status (seconds)"));
615 printf (" %s\n", "-c, --critical=THRESHOLD"); 615 printf (" %s\n", "-c, --critical=THRESHOLD");
616 printf (" %s\n", _("Offset to result in critical status (seconds)")); 616 printf (" %s\n", _("Offset to result in critical status (seconds)"));
617 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 617 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
618 printf (UT_VERBOSE); 618 printf (UT_VERBOSE);
619 619
620 printf("\n"); 620 printf("\n");
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
index 6ebe8f8..f27849a 100644
--- a/plugins/check_nwstat.c
+++ b/plugins/check_nwstat.c
@@ -1664,7 +1664,7 @@ void print_help(void)
1664 printf (" %s\n", "-o, --osversion"); 1664 printf (" %s\n", "-o, --osversion");
1665 printf (" %s\n", _("Include server version string in results")); 1665 printf (" %s\n", _("Include server version string in results"));
1666 1666
1667 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 1667 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
1668 1668
1669 printf ("\n"); 1669 printf ("\n");
1670 printf ("%s\n", _("Notes:")); 1670 printf ("%s\n", _("Notes:"));
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c
index 95977e9..78df1ab 100644
--- a/plugins/check_overcr.c
+++ b/plugins/check_overcr.c
@@ -442,7 +442,7 @@ print_help (void)
442 printf (" %s\n", _("NET<port> = number of active connections on TCP port <port>")); 442 printf (" %s\n", _("NET<port> = number of active connections on TCP port <port>"));
443 printf (" %s\n", _("UPTIME = system uptime in seconds")); 443 printf (" %s\n", _("UPTIME = system uptime in seconds"));
444 444
445 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 445 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
446 446
447 printf (UT_VERBOSE); 447 printf (UT_VERBOSE);
448 448
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 324bd5f..e4f8202 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -524,7 +524,7 @@ print_help (void)
524 524
525 printf (UT_WARN_CRIT); 525 printf (UT_WARN_CRIT);
526 526
527 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 527 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
528 528
529 printf (" %s\n", "-q, --query=STRING"); 529 printf (" %s\n", "-q, --query=STRING");
530 printf (" %s\n", _("SQL query to run. Only first column in first row will be read")); 530 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 eef2195..7654373 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -581,7 +581,7 @@ print_help (void)
581 printf (" %s\n", "-L, --link"); 581 printf (" %s\n", "-L, --link");
582 printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)")); 582 printf (" %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));
583 583
584 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 584 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
585 585
586 printf ("\n"); 586 printf ("\n");
587 printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel")); 587 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 c2239db..4646b8a 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_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 718 printf (UT_CONN_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/check_radius.c b/plugins/check_radius.c
index e54105b..2e439ef 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -361,7 +361,7 @@ print_help (void)
361 printf (" %s\n", "-r, --retries=INTEGER"); 361 printf (" %s\n", "-r, --retries=INTEGER");
362 printf (" %s\n", _("Number of times to retry a failed connection")); 362 printf (" %s\n", _("Number of times to retry a failed connection"));
363 363
364 printf (UT_TIMEOUT, timeout_interval); 364 printf (UT_CONN_TIMEOUT, timeout_interval);
365 365
366 printf ("\n"); 366 printf ("\n");
367 printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections.")); 367 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 18240f3..284ff29 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -429,7 +429,7 @@ print_help (void)
429 429
430 printf (UT_WARN_CRIT); 430 printf (UT_WARN_CRIT);
431 431
432 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 432 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
433 433
434 printf (UT_VERBOSE); 434 printf (UT_VERBOSE);
435 435
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index d477a51..a67103e 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -822,7 +822,7 @@ print_help (void)
822 822
823 printf (UT_WARN_CRIT); 823 printf (UT_WARN_CRIT);
824 824
825 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 825 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
826 826
827 printf (UT_VERBOSE); 827 printf (UT_VERBOSE);
828 828
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 52ad31e..e15e834 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -1160,7 +1160,7 @@ print_help (void)
1160 printf (" %s\n", "-D, --output-delimiter=STRING"); 1160 printf (" %s\n", "-D, --output-delimiter=STRING");
1161 printf (" %s\n", _("Separates output on multiple OID requests")); 1161 printf (" %s\n", _("Separates output on multiple OID requests"));
1162 1162
1163 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 1163 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
1164 printf (" %s\n", "-e, --retries=INTEGER"); 1164 printf (" %s\n", "-e, --retries=INTEGER");
1165 printf (" %s\n", _("Number of retries to be used in the requests")); 1165 printf (" %s\n", _("Number of retries to be used in the requests"));
1166 1166
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 6e8a5fc..3712a3f 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -291,7 +291,7 @@ print_help (void)
291 291
292 printf (UT_IPv46); 292 printf (UT_IPv46);
293 293
294 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 294 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
295 295
296 printf (" %s\n", "-r, --remote-version=STRING"); 296 printf (" %s\n", "-r, --remote-version=STRING");
297 printf (" %s\n", _("Warn if string doesn't match expected server version (ex: OpenSSH_3.9p1)")); 297 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 6ab8261..82562c4 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -670,7 +670,7 @@ print_help (void)
670 670
671 printf (UT_WARN_CRIT); 671 printf (UT_WARN_CRIT);
672 672
673 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 673 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
674 674
675 printf (UT_VERBOSE); 675 printf (UT_VERBOSE);
676 676
diff --git a/plugins/check_time.c b/plugins/check_time.c
index 7ee014e..df3ce97 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -358,7 +358,7 @@ print_help (void)
358 printf (" %s\n", "-C, --critical-connect=INTEGER"); 358 printf (" %s\n", "-C, --critical-connect=INTEGER");
359 printf (" %s\n", _("Response time (sec.) necessary to result in critical status")); 359 printf (" %s\n", _("Response time (sec.) necessary to result in critical status"));
360 360
361 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 361 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
362 362
363 printf (UT_SUPPORT); 363 printf (UT_SUPPORT);
364} 364}
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 59dcc26..4c03edd 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -625,7 +625,7 @@ print_help (void)
625 625
626 printf (UT_WARN_CRIT); 626 printf (UT_WARN_CRIT);
627 627
628 printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); 628 printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
629 629
630/* TODO: -v clashing with -v/-variable. Commenting out help text since verbose 630/* TODO: -v clashing with -v/-variable. Commenting out help text since verbose
631 is unused up to now */ 631 is unused up to now */
diff --git a/plugins/negate.c b/plugins/negate.c
index ef7d4e0..4eddf24 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_TIMEOUT, timeout_interval); 255 printf (UT_CONN_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"));