diff options
Diffstat (limited to 'plugins')
38 files changed, 1 insertions, 186 deletions
diff --git a/plugins/check_apt.c b/plugins/check_apt.c index 7276f031..14804943 100644 --- a/plugins/check_apt.c +++ b/plugins/check_apt.c | |||
| @@ -453,12 +453,6 @@ print_help (void) | |||
| 453 | printf (" %s\n", _("timeout (with -t) to prevent the plugin from timing out if apt-get")); | 453 | printf (" %s\n", _("timeout (with -t) to prevent the plugin from timing out if apt-get")); |
| 454 | printf (" %s\n", _("upgrade is expected to take longer than the default timeout.")); | 454 | printf (" %s\n", _("upgrade is expected to take longer than the default timeout.")); |
| 455 | 455 | ||
| 456 | #ifdef NP_EXTRA_OPTS | ||
| 457 | printf("\n"); | ||
| 458 | printf("%s\n", _("Notes:")); | ||
| 459 | printf(UT_EXTRA_OPTS_NOTES); | ||
| 460 | #endif | ||
| 461 | |||
| 462 | printf(UT_SUPPORT); | 456 | printf(UT_SUPPORT); |
| 463 | } | 457 | } |
| 464 | 458 | ||
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c index b688d435..a569c195 100644 --- a/plugins/check_by_ssh.c +++ b/plugins/check_by_ssh.c | |||
| @@ -442,12 +442,6 @@ print_help (void) | |||
| 442 | printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c2;0; up 2 days"); | 442 | printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c2;0; up 2 days"); |
| 443 | printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days"); | 443 | printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days"); |
| 444 | 444 | ||
| 445 | #ifdef NP_EXTRA_OPTS | ||
| 446 | printf("\n"); | ||
| 447 | printf("%s\n", _("Notes:")); | ||
| 448 | printf(UT_EXTRA_OPTS_NOTES); | ||
| 449 | #endif | ||
| 450 | |||
| 451 | printf(UT_SUPPORT); | 445 | printf(UT_SUPPORT); |
| 452 | } | 446 | } |
| 453 | 447 | ||
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c index f2322271..8c209f9c 100644 --- a/plugins/check_cluster.c +++ b/plugins/check_cluster.c | |||
| @@ -256,10 +256,6 @@ print_help(void) | |||
| 256 | printf("\n"); | 256 | printf("\n"); |
| 257 | printf("%s\n", _("Notes:")); | 257 | printf("%s\n", _("Notes:")); |
| 258 | printf(UT_THRESHOLDS_NOTES); | 258 | printf(UT_THRESHOLDS_NOTES); |
| 259 | #ifdef NP_EXTRA_OPTS | ||
| 260 | printf ("\n"); | ||
| 261 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 262 | #endif | ||
| 263 | 259 | ||
| 264 | printf ("\n"); | 260 | printf ("\n"); |
| 265 | printf ("%s\n", _("Examples:")); | 261 | printf ("%s\n", _("Examples:")); |
diff --git a/plugins/check_dig.c b/plugins/check_dig.c index 45189b00..6f4d8e77 100644 --- a/plugins/check_dig.c +++ b/plugins/check_dig.c | |||
| @@ -343,12 +343,6 @@ print_help (void) | |||
| 343 | printf (" %s\n", "check_dig -H DNSSERVER -l www.example.com -A \"+tcp\""); | 343 | printf (" %s\n", "check_dig -H DNSSERVER -l www.example.com -A \"+tcp\""); |
| 344 | printf (" %s\n", "This will send a tcp query to DNSSERVER for www.example.com"); | 344 | printf (" %s\n", "This will send a tcp query to DNSSERVER for www.example.com"); |
| 345 | 345 | ||
| 346 | #ifdef NP_EXTRA_OPTS | ||
| 347 | printf ("\n"); | ||
| 348 | printf ("%s\n", _("Notes:")); | ||
| 349 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 350 | #endif | ||
| 351 | |||
| 352 | printf (UT_SUPPORT); | 346 | printf (UT_SUPPORT); |
| 353 | } | 347 | } |
| 354 | 348 | ||
diff --git a/plugins/check_disk.c b/plugins/check_disk.c index 633aa5fc..f2ed983b 100644 --- a/plugins/check_disk.c +++ b/plugins/check_disk.c | |||
| @@ -959,12 +959,6 @@ print_help (void) | |||
| 959 | printf (" %s\n", "-X, --exclude-type=TYPE"); | 959 | printf (" %s\n", "-X, --exclude-type=TYPE"); |
| 960 | printf (" %s\n", _("Ignore all filesystems of indicated type (may be repeated)")); | 960 | printf (" %s\n", _("Ignore all filesystems of indicated type (may be repeated)")); |
| 961 | 961 | ||
| 962 | #ifdef NP_EXTRA_OPTS | ||
| 963 | printf ("\n"); | ||
| 964 | printf ("%s\n", _("Notes:")); | ||
| 965 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 966 | #endif | ||
| 967 | |||
| 968 | printf ("\n"); | 962 | printf ("\n"); |
| 969 | printf ("%s\n", _("Examples:")); | 963 | printf ("%s\n", _("Examples:")); |
| 970 | printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /"); | 964 | printf (" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /"); |
diff --git a/plugins/check_dns.c b/plugins/check_dns.c index a9214298..43167122 100644 --- a/plugins/check_dns.c +++ b/plugins/check_dns.c | |||
| @@ -476,12 +476,6 @@ print_help (void) | |||
| 476 | 476 | ||
| 477 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 477 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
| 478 | 478 | ||
| 479 | #ifdef NP_EXTRA_OPTS | ||
| 480 | printf ("\n"); | ||
| 481 | printf ("%s\n", _("Notes:")); | ||
| 482 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 483 | #endif | ||
| 484 | |||
| 485 | printf (UT_SUPPORT); | 479 | printf (UT_SUPPORT); |
| 486 | } | 480 | } |
| 487 | 481 | ||
diff --git a/plugins/check_fping.c b/plugins/check_fping.c index 4e6533fa..d2c945dd 100644 --- a/plugins/check_fping.c +++ b/plugins/check_fping.c | |||
| @@ -422,12 +422,6 @@ print_help (void) | |||
| 422 | printf (" %s\n", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of")); | 422 | printf (" %s\n", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of")); |
| 423 | printf (" %s\n", _("packet loss to trigger an alarm state.")); | 423 | printf (" %s\n", _("packet loss to trigger an alarm state.")); |
| 424 | 424 | ||
| 425 | #ifdef NP_EXTRA_OPTS | ||
| 426 | printf ("\n"); | ||
| 427 | printf ("%s\n", _("Notes:")); | ||
| 428 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 429 | #endif | ||
| 430 | |||
| 431 | printf (UT_SUPPORT); | 425 | printf (UT_SUPPORT); |
| 432 | } | 426 | } |
| 433 | 427 | ||
diff --git a/plugins/check_game.c b/plugins/check_game.c index bcde1038..815c72d6 100644 --- a/plugins/check_game.c +++ b/plugins/check_game.c | |||
| @@ -319,10 +319,6 @@ print_help (void) | |||
| 319 | printf (" %s\n", _("This plugin uses the 'qstat' command, the popular game server status query tool.")); | 319 | printf (" %s\n", _("This plugin uses the 'qstat' command, the popular game server status query tool.")); |
| 320 | printf (" %s\n", _("If you don't have the package installed, you will need to download it from")); | 320 | printf (" %s\n", _("If you don't have the package installed, you will need to download it from")); |
| 321 | printf (" %s\n", _("http://www.activesw.com/people/steve/qstat.html before you can use this plugin.")); | 321 | printf (" %s\n", _("http://www.activesw.com/people/steve/qstat.html before you can use this plugin.")); |
| 322 | #ifdef NP_EXTRA_OPTS | ||
| 323 | printf ("\n"); | ||
| 324 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 325 | #endif | ||
| 326 | 322 | ||
| 327 | printf (UT_SUPPORT); | 323 | printf (UT_SUPPORT); |
| 328 | } | 324 | } |
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c index e4e8e6e5..97411d18 100644 --- a/plugins/check_hpjd.c +++ b/plugins/check_hpjd.c | |||
| @@ -403,12 +403,6 @@ print_help (void) | |||
| 403 | printf (_("(default=%s)"), DEFAULT_COMMUNITY); | 403 | printf (_("(default=%s)"), DEFAULT_COMMUNITY); |
| 404 | printf ("\n"); | 404 | printf ("\n"); |
| 405 | 405 | ||
| 406 | #ifdef NP_EXTRA_OPTS | ||
| 407 | printf ("\n"); | ||
| 408 | printf ("%s\n", _("Notes:")); | ||
| 409 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 410 | #endif | ||
| 411 | |||
| 412 | printf (UT_SUPPORT); | 406 | printf (UT_SUPPORT); |
| 413 | } | 407 | } |
| 414 | 408 | ||
diff --git a/plugins/check_http.c b/plugins/check_http.c index 6c53f7ad..a21669c0 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c | |||
| @@ -1400,8 +1400,6 @@ print_help (void) | |||
| 1400 | printf (" %s\n", _("messages from the host result in STATE_WARNING return values. If you are")); | 1400 | printf (" %s\n", _("messages from the host result in STATE_WARNING return values. If you are")); |
| 1401 | printf (" %s\n", _("checking a virtual server that uses 'host headers' you must supply the FQDN")); | 1401 | printf (" %s\n", _("checking a virtual server that uses 'host headers' you must supply the FQDN")); |
| 1402 | printf (" %s\n", _("(fully qualified domain name) as the [host_name] argument.")); | 1402 | printf (" %s\n", _("(fully qualified domain name) as the [host_name] argument.")); |
| 1403 | printf ("\n"); | ||
| 1404 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 1405 | 1403 | ||
| 1406 | #ifdef HAVE_SSL | 1404 | #ifdef HAVE_SSL |
| 1407 | printf ("\n"); | 1405 | printf ("\n"); |
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c index 3811dc12..b0517395 100644 --- a/plugins/check_ide_smart.c +++ b/plugins/check_ide_smart.c | |||
| @@ -506,12 +506,6 @@ print_help (void) | |||
| 506 | printf (" %s\n", "-n, --nagios"); | 506 | printf (" %s\n", "-n, --nagios"); |
| 507 | printf (" %s\n", _("Output suitable for Nagios")); | 507 | printf (" %s\n", _("Output suitable for Nagios")); |
| 508 | 508 | ||
| 509 | #ifdef NP_EXTRA_OPTS | ||
| 510 | printf ("\n"); | ||
| 511 | printf ("%s\n", _("Notes:")); | ||
| 512 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 513 | #endif | ||
| 514 | |||
| 515 | printf (UT_SUPPORT); | 509 | printf (UT_SUPPORT); |
| 516 | } | 510 | } |
| 517 | 511 | ||
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c index 66834e88..11644a1f 100644 --- a/plugins/check_ldap.c +++ b/plugins/check_ldap.c | |||
| @@ -437,10 +437,6 @@ print_help (void) | |||
| 437 | printf (" %s\n", _("'SSL on connect' will be used no matter how the plugin was called.")); | 437 | printf (" %s\n", _("'SSL on connect' will be used no matter how the plugin was called.")); |
| 438 | printf (" %s\n", _("This detection is deprecated, please use 'check_ldap' with the '--starttls' or '--ssl' flags")); | 438 | printf (" %s\n", _("This detection is deprecated, please use 'check_ldap' with the '--starttls' or '--ssl' flags")); |
| 439 | printf (" %s\n", _("to define the behaviour explicitly instead.")); | 439 | printf (" %s\n", _("to define the behaviour explicitly instead.")); |
| 440 | #ifdef NP_EXTRA_OPTS | ||
| 441 | printf ("\n"); | ||
| 442 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 443 | #endif | ||
| 444 | 440 | ||
| 445 | printf (UT_SUPPORT); | 441 | printf (UT_SUPPORT); |
| 446 | } | 442 | } |
diff --git a/plugins/check_load.c b/plugins/check_load.c index 450a4fc3..99e2a15f 100644 --- a/plugins/check_load.c +++ b/plugins/check_load.c | |||
| @@ -316,12 +316,6 @@ print_help (void) | |||
| 316 | printf (" %s\n", "-r, --percpu"); | 316 | printf (" %s\n", "-r, --percpu"); |
| 317 | printf (" %s\n", _("Divide the load averages by the number of CPUs (when possible)")); | 317 | printf (" %s\n", _("Divide the load averages by the number of CPUs (when possible)")); |
| 318 | 318 | ||
| 319 | #ifdef NP_EXTRA_OPTS | ||
| 320 | printf ("\n"); | ||
| 321 | printf ("%s\n", _("Notes:")); | ||
| 322 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 323 | #endif | ||
| 324 | |||
| 325 | printf (UT_SUPPORT); | 319 | printf (UT_SUPPORT); |
| 326 | } | 320 | } |
| 327 | 321 | ||
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c index 6736c117..07013ee6 100644 --- a/plugins/check_mrtg.c +++ b/plugins/check_mrtg.c | |||
| @@ -367,9 +367,6 @@ print_help (void) | |||
| 367 | printf (" %s\n", _("you can always hack the code to make this plugin work for you...")); | 367 | printf (" %s\n", _("you can always hack the code to make this plugin work for you...")); |
| 368 | printf (" %s\n", _("- MRTG stands for the Multi Router Traffic Grapher. It can be downloaded from")); | 368 | printf (" %s\n", _("- MRTG stands for the Multi Router Traffic Grapher. It can be downloaded from")); |
| 369 | printf (" %s\n", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html"); | 369 | printf (" %s\n", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html"); |
| 370 | #ifdef NP_EXTRA_OPTS | ||
| 371 | printf (" -%s", UT_EXTRA_OPTS_NOTES); | ||
| 372 | #endif | ||
| 373 | 370 | ||
| 374 | printf (UT_SUPPORT); | 371 | printf (UT_SUPPORT); |
| 375 | } | 372 | } |
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c index 1234bff4..4fd9bc0a 100644 --- a/plugins/check_mrtgtraf.c +++ b/plugins/check_mrtgtraf.c | |||
| @@ -366,9 +366,6 @@ print_help (void) | |||
| 366 | printf (" %s\n", _("- The calculated i/o rates are a little off from what MRTG actually")); | 366 | printf (" %s\n", _("- The calculated i/o rates are a little off from what MRTG actually")); |
| 367 | printf (" %s\n", _(" reports. I'm not sure why this is right now, but will look into it")); | 367 | printf (" %s\n", _(" reports. I'm not sure why this is right now, but will look into it")); |
| 368 | printf (" %s\n", _(" for future enhancements of this plugin.")); | 368 | printf (" %s\n", _(" for future enhancements of this plugin.")); |
| 369 | #ifdef NP_EXTRA_OPTS | ||
| 370 | printf (" -%s", UT_EXTRA_OPTS_NOTES); | ||
| 371 | #endif | ||
| 372 | 369 | ||
| 373 | printf (UT_SUPPORT); | 370 | printf (UT_SUPPORT); |
| 374 | } | 371 | } |
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c index ce190621..b3caf4b5 100644 --- a/plugins/check_mysql.c +++ b/plugins/check_mysql.c | |||
| @@ -410,14 +410,10 @@ print_help (void) | |||
| 410 | printf (" %s\n", _("using the default unix socket. You can force TCP on localhost by using an")); | 410 | printf (" %s\n", _("using the default unix socket. You can force TCP on localhost by using an")); |
| 411 | printf (" %s\n", _("IP address or FQDN ('localhost' will use the socket as well).")); | 411 | printf (" %s\n", _("IP address or FQDN ('localhost' will use the socket as well).")); |
| 412 | 412 | ||
| 413 | #ifdef NP_EXTRA_OPTS | ||
| 414 | printf ("\n"); | 413 | printf ("\n"); |
| 415 | printf ("%s\n", _("Notes:")); | 414 | printf ("%s\n", _("Notes:")); |
| 416 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 417 | printf ("\n"); | ||
| 418 | printf (" %s\n", _("You must specify -p with an empty string to force an empty password,")); | 415 | printf (" %s\n", _("You must specify -p with an empty string to force an empty password,")); |
| 419 | printf (" %s\n", _("overriding any my.cnf settings.")); | 416 | printf (" %s\n", _("overriding any my.cnf settings.")); |
| 420 | #endif | ||
| 421 | 417 | ||
| 422 | printf (UT_SUPPORT); | 418 | printf (UT_SUPPORT); |
| 423 | } | 419 | } |
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c index 40adf092..cae47187 100644 --- a/plugins/check_mysql_query.c +++ b/plugins/check_mysql_query.c | |||
| @@ -310,14 +310,10 @@ print_help (void) | |||
| 310 | printf (" %s\n", _("A query is required. The result from the query should be numeric.")); | 310 | printf (" %s\n", _("A query is required. The result from the query should be numeric.")); |
| 311 | printf (" %s\n", _("For extra security, create a user with minimal access.")); | 311 | printf (" %s\n", _("For extra security, create a user with minimal access.")); |
| 312 | 312 | ||
| 313 | #ifdef NP_EXTRA_OPTS | ||
| 314 | printf ("\n"); | 313 | printf ("\n"); |
| 315 | printf ("%s\n", _("Notes:")); | 314 | printf ("%s\n", _("Notes:")); |
| 316 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 317 | printf ("\n"); | ||
| 318 | printf (" %s\n", _("You must specify -p with an empty string to force an empty password,")); | 315 | printf (" %s\n", _("You must specify -p with an empty string to force an empty password,")); |
| 319 | printf (" %s\n", _("overriding any my.cnf settings.")); | 316 | printf (" %s\n", _("overriding any my.cnf settings.")); |
| 320 | #endif | ||
| 321 | 317 | ||
| 322 | printf (UT_SUPPORT); | 318 | printf (UT_SUPPORT); |
| 323 | } | 319 | } |
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c index 24ddadd7..1a809164 100644 --- a/plugins/check_nagios.c +++ b/plugins/check_nagios.c | |||
| @@ -298,12 +298,6 @@ print_help (void) | |||
| 298 | printf (" %s\n", _("Substring to search for in process arguments")); | 298 | printf (" %s\n", _("Substring to search for in process arguments")); |
| 299 | printf (UT_VERBOSE); | 299 | printf (UT_VERBOSE); |
| 300 | 300 | ||
| 301 | #ifdef NP_EXTRA_OPTS | ||
| 302 | printf ("\n"); | ||
| 303 | printf ("%s\n", _("Notes:")); | ||
| 304 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 305 | #endif | ||
| 306 | |||
| 307 | printf ("\n"); | 301 | printf ("\n"); |
| 308 | printf ("%s\n", _("Examples:")); | 302 | printf ("%s\n", _("Examples:")); |
| 309 | printf (" %s\n", "check_nagios -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios"); | 303 | printf (" %s\n", "check_nagios -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios"); |
diff --git a/plugins/check_nt.c b/plugins/check_nt.c index c877f9cc..e4d64e8f 100644 --- a/plugins/check_nt.c +++ b/plugins/check_nt.c | |||
| @@ -748,9 +748,6 @@ void print_help(void) | |||
| 748 | printf (" %s\n", _("output when this happens contains \"Cannot map xxxxx to protocol number\".")); | 748 | printf (" %s\n", _("output when this happens contains \"Cannot map xxxxx to protocol number\".")); |
| 749 | printf (" %s\n", _("One fix for this is to change the port to something else on check_nt ")); | 749 | printf (" %s\n", _("One fix for this is to change the port to something else on check_nt ")); |
| 750 | printf (" %s\n", _("and on the client service it\'s connecting to.")); | 750 | printf (" %s\n", _("and on the client service it\'s connecting to.")); |
| 751 | #ifdef NP_EXTRA_OPTS | ||
| 752 | printf (" -%s", UT_EXTRA_OPTS_NOTES); | ||
| 753 | #endif | ||
| 754 | 751 | ||
| 755 | printf (UT_SUPPORT); | 752 | printf (UT_SUPPORT); |
| 756 | } | 753 | } |
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c index 35fddec9..e752bd9f 100644 --- a/plugins/check_ntp.c +++ b/plugins/check_ntp.c | |||
| @@ -859,10 +859,6 @@ void print_help(void){ | |||
| 859 | printf("\n"); | 859 | printf("\n"); |
| 860 | printf("%s\n", _("Notes:")); | 860 | printf("%s\n", _("Notes:")); |
| 861 | printf(UT_THRESHOLDS_NOTES); | 861 | printf(UT_THRESHOLDS_NOTES); |
| 862 | #ifdef NP_EXTRA_OPTS | ||
| 863 | printf("\n"); | ||
| 864 | printf(UT_EXTRA_OPTS_NOTES); | ||
| 865 | #endif | ||
| 866 | 862 | ||
| 867 | printf("\n"); | 863 | printf("\n"); |
| 868 | printf("%s\n", _("Examples:")); | 864 | printf("%s\n", _("Examples:")); |
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c index fa18cfb9..abe91a52 100644 --- a/plugins/check_ntp_peer.c +++ b/plugins/check_ntp_peer.c | |||
| @@ -693,10 +693,6 @@ void print_help(void){ | |||
| 693 | printf(" %s\n", _("server; please use check_ntp_time for that purpose.")); | 693 | printf(" %s\n", _("server; please use check_ntp_time for that purpose.")); |
| 694 | printf("\n"); | 694 | printf("\n"); |
| 695 | printf(UT_THRESHOLDS_NOTES); | 695 | printf(UT_THRESHOLDS_NOTES); |
| 696 | #ifdef NP_EXTRA_OPTS | ||
| 697 | printf("\n"); | ||
| 698 | printf(UT_EXTRA_OPTS_NOTES); | ||
| 699 | #endif | ||
| 700 | 696 | ||
| 701 | printf("\n"); | 697 | printf("\n"); |
| 702 | printf("%s\n", _("Examples:")); | 698 | printf("%s\n", _("Examples:")); |
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c index cd412fe5..1ea3e893 100644 --- a/plugins/check_ntp_time.c +++ b/plugins/check_ntp_time.c | |||
| @@ -623,10 +623,6 @@ void print_help(void){ | |||
| 623 | printf(" %s\n", _("check_ntp_peer.")); | 623 | printf(" %s\n", _("check_ntp_peer.")); |
| 624 | printf("\n"); | 624 | printf("\n"); |
| 625 | printf(UT_THRESHOLDS_NOTES); | 625 | printf(UT_THRESHOLDS_NOTES); |
| 626 | #ifdef NP_EXTRA_OPTS | ||
| 627 | printf("\n"); | ||
| 628 | printf(UT_EXTRA_OPTS_NOTES); | ||
| 629 | #endif | ||
| 630 | 626 | ||
| 631 | printf("\n"); | 627 | printf("\n"); |
| 632 | printf("%s\n", _("Examples:")); | 628 | printf("%s\n", _("Examples:")); |
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c index 2c3369a5..6e092867 100644 --- a/plugins/check_nwstat.c +++ b/plugins/check_nwstat.c | |||
| @@ -1674,9 +1674,6 @@ void print_help(void) | |||
| 1674 | printf (" %s\n", _("- Values for critical thresholds should be lower than warning thresholds")); | 1674 | printf (" %s\n", _("- Values for critical thresholds should be lower than warning thresholds")); |
| 1675 | printf (" %s\n", _(" when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, ")); | 1675 | printf (" %s\n", _(" when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, ")); |
| 1676 | printf (" %s\n", _(" TCB, LRUS and LRUM.")); | 1676 | printf (" %s\n", _(" TCB, LRUS and LRUM.")); |
| 1677 | #ifdef NP_EXTRA_OPTS | ||
| 1678 | printf (" -%s", UT_EXTRA_OPTS_NOTES); | ||
| 1679 | #endif | ||
| 1680 | 1677 | ||
| 1681 | printf (UT_SUPPORT); | 1678 | printf (UT_SUPPORT); |
| 1682 | } | 1679 | } |
diff --git a/plugins/check_overcr.c b/plugins/check_overcr.c index 5751dc05..606799f1 100644 --- a/plugins/check_overcr.c +++ b/plugins/check_overcr.c | |||
| @@ -456,10 +456,6 @@ print_help (void) | |||
| 456 | printf ("%s\n", _("Notes:")); | 456 | printf ("%s\n", _("Notes:")); |
| 457 | printf (" %s\n", _("For the available options, the critical threshold value should always be")); | 457 | printf (" %s\n", _("For the available options, the critical threshold value should always be")); |
| 458 | printf (" %s\n", _("higher than the warning threshold value, EXCEPT with the uptime variable")); | 458 | printf (" %s\n", _("higher than the warning threshold value, EXCEPT with the uptime variable")); |
| 459 | #ifdef NP_EXTRA_OPTS | ||
| 460 | printf ("\n"); | ||
| 461 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 462 | #endif | ||
| 463 | 459 | ||
| 464 | printf (UT_SUPPORT); | 460 | printf (UT_SUPPORT); |
| 465 | } | 461 | } |
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c index a3652149..06e1127b 100644 --- a/plugins/check_pgsql.c +++ b/plugins/check_pgsql.c | |||
| @@ -466,12 +466,6 @@ print_help (void) | |||
| 466 | printf (" %s\n", _("able to connect to the database without a password. The plugin can also send")); | 466 | printf (" %s\n", _("able to connect to the database without a password. The plugin can also send")); |
| 467 | printf (" %s\n", _("a password, but no effort is made to obsure or encrypt the password.")); | 467 | printf (" %s\n", _("a password, but no effort is made to obsure or encrypt the password.")); |
| 468 | 468 | ||
| 469 | #ifdef NP_EXTRA_OPTS | ||
| 470 | printf ("\n"); | ||
| 471 | printf ("%s\n", _("Notes:")); | ||
| 472 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 473 | #endif | ||
| 474 | |||
| 475 | printf (UT_SUPPORT); | 469 | printf (UT_SUPPORT); |
| 476 | } | 470 | } |
| 477 | 471 | ||
diff --git a/plugins/check_ping.c b/plugins/check_ping.c index 45108afb..db8e623f 100644 --- a/plugins/check_ping.c +++ b/plugins/check_ping.c | |||
| @@ -592,12 +592,6 @@ print_help (void) | |||
| 592 | printf ("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in")); | 592 | printf ("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in")); |
| 593 | printf ("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/")); | 593 | printf ("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/")); |
| 594 | 594 | ||
| 595 | #ifdef NP_EXTRA_OPTS | ||
| 596 | printf ("\n"); | ||
| 597 | printf ("%s\n", _("Notes:")); | ||
| 598 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 599 | #endif | ||
| 600 | |||
| 601 | printf (UT_SUPPORT); | 595 | printf (UT_SUPPORT); |
| 602 | } | 596 | } |
| 603 | 597 | ||
diff --git a/plugins/check_procs.c b/plugins/check_procs.c index e9372ff6..8655f6a3 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c | |||
| @@ -739,12 +739,6 @@ the specified threshold ranges. The process count can be filtered by\n\ | |||
| 739 | process owner, parent process PID, current state (e.g., 'Z'), or may\n\ | 739 | process owner, parent process PID, current state (e.g., 'Z'), or may\n\ |
| 740 | be the total number of running processes\n\n")); | 740 | be the total number of running processes\n\n")); |
| 741 | 741 | ||
| 742 | #ifdef NP_EXTRA_OPTS | ||
| 743 | printf ("%s\n", _("Notes:")); | ||
| 744 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 745 | printf ("\n"); | ||
| 746 | #endif | ||
| 747 | |||
| 748 | printf ("%s\n", _("Examples:")); | 742 | printf ("%s\n", _("Examples:")); |
| 749 | printf (" %s\n", "check_procs -w 2:2 -c 2:1024 -C portsentry"); | 743 | printf (" %s\n", "check_procs -w 2:2 -c 2:1024 -C portsentry"); |
| 750 | printf (" %s\n", _("Warning if not two processes with command name portsentry.")); | 744 | printf (" %s\n", _("Warning if not two processes with command name portsentry.")); |
diff --git a/plugins/check_radius.c b/plugins/check_radius.c index c95fbe1f..d5907dde 100644 --- a/plugins/check_radius.c +++ b/plugins/check_radius.c | |||
| @@ -374,12 +374,6 @@ print_help (void) | |||
| 374 | printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that")); | 374 | printf ("%s\n", _("run the plugin at regular predictable intervals. Please be sure that")); |
| 375 | printf ("%s\n", _("the password used does not allow access to sensitive system resources.")); | 375 | printf ("%s\n", _("the password used does not allow access to sensitive system resources.")); |
| 376 | 376 | ||
| 377 | #ifdef NP_EXTRA_OPTS | ||
| 378 | printf ("\n"); | ||
| 379 | printf ("%s\n", _("Notes:")); | ||
| 380 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 381 | #endif | ||
| 382 | |||
| 383 | printf (UT_SUPPORT); | 377 | printf (UT_SUPPORT); |
| 384 | } | 378 | } |
| 385 | 379 | ||
diff --git a/plugins/check_real.c b/plugins/check_real.c index 16433470..1f8ae429 100644 --- a/plugins/check_real.c +++ b/plugins/check_real.c | |||
| @@ -440,12 +440,6 @@ print_help (void) | |||
| 440 | printf ("%s\n", _("but incorrect reponse messages from the host result in STATE_WARNING return")); | 440 | printf ("%s\n", _("but incorrect reponse messages from the host result in STATE_WARNING return")); |
| 441 | printf ("%s\n", _("values.")); | 441 | printf ("%s\n", _("values.")); |
| 442 | 442 | ||
| 443 | #ifdef NP_EXTRA_OPTS | ||
| 444 | printf ("\n"); | ||
| 445 | printf ("%s\n", _("Notes:")); | ||
| 446 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 447 | #endif | ||
| 448 | |||
| 449 | printf (UT_SUPPORT); | 443 | printf (UT_SUPPORT); |
| 450 | } | 444 | } |
| 451 | 445 | ||
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c index c78b709c..6707ec53 100644 --- a/plugins/check_smtp.c +++ b/plugins/check_smtp.c | |||
| @@ -808,12 +808,6 @@ print_help (void) | |||
| 808 | printf ("%s\n", _("connects, but incorrect reponse messages from the host result in")); | 808 | printf ("%s\n", _("connects, but incorrect reponse messages from the host result in")); |
| 809 | printf ("%s\n", _("STATE_WARNING return values.")); | 809 | printf ("%s\n", _("STATE_WARNING return values.")); |
| 810 | 810 | ||
| 811 | #ifdef NP_EXTRA_OPTS | ||
| 812 | printf ("\n"); | ||
| 813 | printf ("%s\n", _("Notes:")); | ||
| 814 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 815 | #endif | ||
| 816 | |||
| 817 | printf (UT_SUPPORT); | 811 | printf (UT_SUPPORT); |
| 818 | } | 812 | } |
| 819 | 813 | ||
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c index 6a44bc8c..3f0deb70 100644 --- a/plugins/check_snmp.c +++ b/plugins/check_snmp.c | |||
| @@ -944,9 +944,6 @@ print_help (void) | |||
| 944 | printf (" %s\n", _("- Note that only one string and one regex may be checked at present")); | 944 | printf (" %s\n", _("- Note that only one string and one regex may be checked at present")); |
| 945 | printf (" %s\n", _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value")); | 945 | printf (" %s\n", _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value")); |
| 946 | printf (" %s\n", _("returned from the SNMP query is an unsigned integer.")); | 946 | printf (" %s\n", _("returned from the SNMP query is an unsigned integer.")); |
| 947 | #ifdef NP_EXTRA_OPTS | ||
| 948 | printf (" -%s", UT_EXTRA_OPTS_NOTES); | ||
| 949 | #endif | ||
| 950 | 947 | ||
| 951 | printf (UT_SUPPORT); | 948 | printf (UT_SUPPORT); |
| 952 | } | 949 | } |
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c index 9a193438..b9b8a2d3 100644 --- a/plugins/check_ssh.c +++ b/plugins/check_ssh.c | |||
| @@ -291,12 +291,6 @@ print_help (void) | |||
| 291 | 291 | ||
| 292 | printf (UT_VERBOSE); | 292 | printf (UT_VERBOSE); |
| 293 | 293 | ||
| 294 | #ifdef NP_EXTRA_OPTS | ||
| 295 | printf ("\n"); | ||
| 296 | printf ("%s\n", _("Notes:")); | ||
| 297 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 298 | #endif | ||
| 299 | |||
| 300 | printf (UT_SUPPORT); | 294 | printf (UT_SUPPORT); |
| 301 | } | 295 | } |
| 302 | 296 | ||
diff --git a/plugins/check_swap.c b/plugins/check_swap.c index a1356cfa..c5682d78 100644 --- a/plugins/check_swap.c +++ b/plugins/check_swap.c | |||
| @@ -546,11 +546,6 @@ print_help (void) | |||
| 546 | printf ("\n"); | 546 | printf ("\n"); |
| 547 | printf ("%s\n", _("Notes:")); | 547 | printf ("%s\n", _("Notes:")); |
| 548 | printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.")); | 548 | printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s.")); |
| 549 | #ifdef NP_EXTRA_OPTS | ||
| 550 | printf ("\n"); | ||
| 551 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 552 | #endif | ||
| 553 | |||
| 554 | 549 | ||
| 555 | printf (UT_SUPPORT); | 550 | printf (UT_SUPPORT); |
| 556 | } | 551 | } |
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c index 156765ed..555b8b9a 100644 --- a/plugins/check_tcp.c +++ b/plugins/check_tcp.c | |||
| @@ -641,12 +641,6 @@ print_help (void) | |||
| 641 | 641 | ||
| 642 | printf (UT_VERBOSE); | 642 | printf (UT_VERBOSE); |
| 643 | 643 | ||
| 644 | #ifdef NP_EXTRA_OPTS | ||
| 645 | printf ("\n"); | ||
| 646 | printf ("%s\n", _("Notes:")); | ||
| 647 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 648 | #endif | ||
| 649 | |||
| 650 | printf (UT_SUPPORT); | 644 | printf (UT_SUPPORT); |
| 651 | } | 645 | } |
| 652 | 646 | ||
diff --git a/plugins/check_time.c b/plugins/check_time.c index 7816b238..9e81d9ee 100644 --- a/plugins/check_time.c +++ b/plugins/check_time.c | |||
| @@ -360,12 +360,6 @@ print_help (void) | |||
| 360 | 360 | ||
| 361 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); | 361 | printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); |
| 362 | 362 | ||
| 363 | #ifdef NP_EXTRA_OPTS | ||
| 364 | printf ("\n"); | ||
| 365 | printf ("%s\n", _("Notes:")); | ||
| 366 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 367 | #endif | ||
| 368 | |||
| 369 | printf (UT_SUPPORT); | 363 | printf (UT_SUPPORT); |
| 370 | } | 364 | } |
| 371 | 365 | ||
diff --git a/plugins/check_ups.c b/plugins/check_ups.c index ce57ef3d..aef8e116 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c | |||
| @@ -649,10 +649,6 @@ print_help (void) | |||
| 649 | printf (" %s\n", _("Network UPS Tools be installed on the remote host. If you do not have the")); | 649 | printf (" %s\n", _("Network UPS Tools be installed on the remote host. If you do not have the")); |
| 650 | printf (" %s\n", _("package installed on your system, you can download it from")); | 650 | printf (" %s\n", _("package installed on your system, you can download it from")); |
| 651 | printf (" %s\n", _("http://www.networkupstools.org")); | 651 | printf (" %s\n", _("http://www.networkupstools.org")); |
| 652 | #ifdef NP_EXTRA_OPTS | ||
| 653 | printf ("\n"); | ||
| 654 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 655 | #endif | ||
| 656 | 652 | ||
| 657 | printf (UT_SUPPORT); | 653 | printf (UT_SUPPORT); |
| 658 | } | 654 | } |
diff --git a/plugins/check_users.c b/plugins/check_users.c index dc661d89..061c2fe9 100644 --- a/plugins/check_users.c +++ b/plugins/check_users.c | |||
| @@ -219,12 +219,6 @@ print_help (void) | |||
| 219 | printf (" %s\n", "-c, --critical=INTEGER"); | 219 | printf (" %s\n", "-c, --critical=INTEGER"); |
| 220 | printf (" %s\n", _("Set CRITICAL status if more than INTEGER users are logged in")); | 220 | printf (" %s\n", _("Set CRITICAL status if more than INTEGER users are logged in")); |
| 221 | 221 | ||
| 222 | #ifdef NP_EXTRA_OPTS | ||
| 223 | printf ("\n"); | ||
| 224 | printf ("%s\n", _("Notes:")); | ||
| 225 | printf (UT_EXTRA_OPTS_NOTES); | ||
| 226 | #endif | ||
| 227 | |||
| 228 | printf (UT_SUPPORT); | 222 | printf (UT_SUPPORT); |
| 229 | } | 223 | } |
| 230 | 224 | ||
diff --git a/plugins/utils.h b/plugins/utils.h index 8da2160e..812f588b 100644 --- a/plugins/utils.h +++ b/plugins/utils.h | |||
| @@ -183,12 +183,9 @@ char *fperfdata (const char *, | |||
| 183 | #ifdef NP_EXTRA_OPTS | 183 | #ifdef NP_EXTRA_OPTS |
| 184 | #define UT_EXTRA_OPTS _("\ | 184 | #define UT_EXTRA_OPTS _("\ |
| 185 | --extra-opts=[section][@file]\n\ | 185 | --extra-opts=[section][@file]\n\ |
| 186 | Read additionnal options from ini file\n") | 186 | Read options from an ini file. See http://nagiosplugins.org/extra-opts for usage\n") |
| 187 | #define UT_EXTRA_OPTS_NOTES _("\ | ||
| 188 | See: http://nagiosplugins.org/extra-opts for --extra-opts usage and examples.\n") | ||
| 189 | #else | 187 | #else |
| 190 | #define UT_EXTRA_OPTS "" | 188 | #define UT_EXTRA_OPTS "" |
| 191 | #define UT_EXTRA_OPTS_NOTES "" | ||
| 192 | #endif | 189 | #endif |
| 193 | 190 | ||
| 194 | #define UT_THRESHOLDS_NOTES _("\ | 191 | #define UT_THRESHOLDS_NOTES _("\ |
