summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/check_by_ssh.c96
-rw-r--r--plugins/check_dig.c37
-rw-r--r--plugins/check_disk.c10
3 files changed, 56 insertions, 87 deletions
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 75369ec..b1688d0 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -20,7 +20,7 @@
20 20
21const char *progname = "check_by_ssh"; 21const char *progname = "check_by_ssh";
22const char *revision = "$Revision$"; 22const char *revision = "$Revision$";
23const char *copyright = "2000-2004"; 23const char *copyright = "2000-2006";
24const char *email = "nagiosplug-devel@lists.sourceforge.net"; 24const char *email = "nagiosplug-devel@lists.sourceforge.net";
25 25
26#include "common.h" 26#include "common.h"
@@ -299,8 +299,10 @@ print_help (void)
299 printf ("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n"); 299 printf ("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
300 printf (COPYRIGHT, copyright, email); 300 printf (COPYRIGHT, copyright, email);
301 301
302 printf (_("This plugin uses SSH to execute commands on a remote host\n\n")); 302 printf (_("This plugin uses SSH to execute commands on a remote host"));
303 303
304 printf ("\n\n");
305
304 print_usage (); 306 print_usage ();
305 307
306 printf (_(UT_HELP_VRSN)); 308 printf (_(UT_HELP_VRSN));
@@ -309,56 +311,44 @@ print_help (void)
309 311
310 printf (_(UT_IPv46)); 312 printf (_(UT_IPv46));
311 313
312 printf (_("\ 314 printf (" %s\n", "-1, --proto1");
313 -1, --proto1\n\ 315 printf (" %s\n", _("tell ssh to use Protocol 1"));
314 tell ssh to use Protocol 1\n\ 316 printf (" %s\n", "-2, --proto2");
315 -2, --proto2\n\ 317 printf (" %s\n", _("tell ssh to use Protocol 2"));
316 tell ssh to use Protocol 2\n\ 318 printf (" %s\n", "-S, --skiplines=n");
317 -S, --skiplines=n\n\ 319 printf (" %s\n", _("Ignore first n lines on STDERR (to suppress a logon banner)"));
318 Ignore first n lines on STDERR (to suppress a logon banner)\n\ 320 printf (" %s\n", "-f");
319 -f\n\ 321 printf (" %s\n", _("tells ssh to fork rather than create a tty"));
320 tells ssh to fork rather than create a tty\n")); 322 printf (" %s\n","-C, --command='COMMAND STRING'");
321 323 printf (" %s\n", _("command to execute on the remote machine"));
322 printf (_("\ 324 printf (" %s\n","-l, --logname=USERNAME");
323 -C, --command='COMMAND STRING'\n\ 325 printf (" %s\n", _("SSH user name on remote host [optional]"));
324 command to execute on the remote machine\n\ 326 printf (" %s\n","-i, --identity=KEYFILE");
325 -l, --logname=USERNAME\n\ 327 printf (" %s\n", _("identity of an authorized key [optional]"));
326 SSH user name on remote host [optional]\n\ 328 printf (" %s\n","-O, --output=FILE");
327 -i, --identity=KEYFILE\n\ 329 printf (" %s\n", _("external command file for nagios [optional]"));
328 identity of an authorized key [optional]\n\ 330 printf (" %s\n","-s, --services=LIST");
329 -O, --output=FILE\n\ 331 printf (" %s\n", _("list of nagios service names, separated by ':' [optional]"));
330 external command file for nagios [optional]\n\ 332 printf (" %s\n","-n, --name=NAME");
331 -s, --services=LIST\n\ 333 printf (" %s\n", _("short name of host in nagios configuration [optional]"));
332 list of nagios service names, separated by ':' [optional]\n\
333 -n, --name=NAME\n\
334 short name of host in nagios configuration [optional]\n"));
335
336 printf (_(UT_WARN_CRIT)); 334 printf (_(UT_WARN_CRIT));
337
338 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 335 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
339 336 printf (" %s\n", _("The most common mode of use is to refer to a local identity file with"));
340 printf (_("\n\ 337 printf (" %s\n", _("the '-i' option. In this mode, the identity pair should have a null"));
341The most common mode of use is to refer to a local identity file with\n\ 338 printf (" %s\n", _("passphrase and the public key should be listed in the authorized_keys"));
342the '-i' option. In this mode, the identity pair should have a null\n\ 339 printf (" %s\n", _("file of the remote host. Usually the key will be restricted to running"));
343passphrase and the public key should be listed in the authorized_keys\n\ 340 printf (" %s\n", _("only one command on the remote server. If the remote SSH server tracks"));
344file of the remote host. Usually the key will be restricted to running\n\ 341 printf (" %s\n", _("invocation arguments, the one remote program may be an agent that can"));
345only one command on the remote server. If the remote SSH server tracks\n\ 342 printf (" %s\n", _("execute additional commands as proxy"));
346invocation arguments, the one remote program may be an agent that can\n\ 343 printf (" %s\n", _("To use passive mode, provide multiple '-C' options, and provide"));
347execute additional commands as proxy\n")); 344 printf (" %s\n", _("all of -O, -s, and -n options (servicelist order must match '-C'options)"));
348 345 printf ("\n");
349 printf (_("\n\ 346 printf ("%s\n", _("Examples:"));
350To use passive mode, provide multiple '-C' options, and provide\n\ 347 printf (" %s\n", "$ check_by_ssh -H localhost -n lh -s c1:c2:c3 -C uptime -C uptime -C uptime -O /tmp/foo");
351all of -O, -s, and -n options (servicelist order must match '-C'\n\ 348 printf (" %s\n", "$ cat /tmp/foo");
352options)\n")); 349 printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c1;0; up 2 days");
353 350 printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c2;0; up 2 days");
354 printf ("\n\ 351 printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days");
355$ check_by_ssh -H localhost -n lh -s c1:c2:c3 \\\n\
356 -C uptime -C uptime -C uptime -O /tmp/foo\n\
357$ cat /tmp/foo\n\
358[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c1;0; up 2 days...\n\
359[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c2;0; up 2 days...\n\
360[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days...\n");
361
362 printf (_(UT_SUPPORT)); 352 printf (_(UT_SUPPORT));
363} 353}
364 354
@@ -367,7 +357,7 @@ $ cat /tmp/foo\n\
367void 357void
368print_usage (void) 358print_usage (void)
369{ 359{
370 printf ("\n\ 360 printf (_("Usage:"));
371Usage: %s [-f46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>\n\ 361 printf(" %s [-f46] [-t timeout] [-i identity] [-l user] -H <host> -C <command>",progname);
372 [-n name] [-s servicelist] [-O outputfile] [-p port]\n", progname); 362 printf(" [-n name] [-s servicelist] [-O outputfile] [-p port]\n");
373} 363}
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index c9fce61..e2a6606 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -302,36 +302,15 @@ print_help (void)
302 302
303 printf (_(UT_HOST_PORT), 'P', myport); 303 printf (_(UT_HOST_PORT), 'P', myport);
304 304
305 printf ("-l, --lookup=STRING"); 305 printf (" %s\n","-l, --lookup=STRING");
306 306 printf (" %s\n",_("machine name to lookup"));
307 printf ("\n"); 307 printf (" %s\n","-T, --record_type=STRING");
308 308 printf (" %s\n",_("record type to lookup (default: A)"));
309 printf (_("machine name to lookup")); 309 printf (" %s\n","-a, --expected_address=STRING");
310 310 printf (" %s\n",_("an address expected to be in the answer section.if not set, uses whatever was in -l"));
311 printf ("\n");
312
313 printf ("-T, --record_type=STRING");
314
315 printf ("\n");
316
317 printf (_("record type to lookup (default: A)"));
318
319 printf ("\n");
320
321 printf ("-a, --expected_address=STRING");
322
323 printf ("\n");
324
325 printf (_("an address expected to be in the answer section.if not set, uses whatever was in -l"));
326
327 printf ("\n");
328
329 printf (_(UT_WARN_CRIT)); 311 printf (_(UT_WARN_CRIT));
330
331 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT); 312 printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
332
333 printf (_(UT_VERBOSE)); 313 printf (_(UT_VERBOSE));
334
335 printf (_(UT_SUPPORT)); 314 printf (_(UT_SUPPORT));
336} 315}
337 316
@@ -342,6 +321,6 @@ print_usage (void)
342{ 321{
343 printf (_("Usage:")); 322 printf (_("Usage:"));
344 printf ("%s -H host -l lookup [-p <server port>] [-T <query type>]", progname); 323 printf ("%s -H host -l lookup [-p <server port>] [-T <query type>]", progname);
345 printf (" [-w <warning interval>] [-c <critical interval>] [-t <timeout>]"); 324 printf (" [-w <warning interval>] [-c <critical interval>] [-t <timeout>]");
346 printf (" [-a <expected answer address>] [-v]\n"); 325 printf (" [-a <expected answer address>] [-v]\n");
347} 326}
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 898e6cb..001800b 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -1,10 +1,10 @@
1/****************************************************************************** 1/******************************************************************************
2 2
3 This program is free software; you can redistribute it and/or modify 3 The Nagios Plugins are free software; you can redistribute them
4 it under the terms of the GNU General Public License as published by 4 and/or modify them under the terms of the GNU General Public
5 the Free Software Foundation; either version 2 of the License, or 5 License as published by the Free Software Foundation; either
6 (at your option) any later version. 6 version 2 of the License, or (at your option) any later version.
7 7
8 This program is distributed in the hope that it will be useful, 8 This program is distributed in the hope that it will be useful,
9 but WITHOUT ANY WARRANTY; without even the implied warranty of 9 but WITHOUT ANY WARRANTY; without even the implied warranty of
10 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the