![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index a678e2a4e8f2d975e85cf7a70d8465c6aefe13b1..4439251fba5b298c292a45ca8a1c27f55e917746 100644 (file)
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ $Id$
+
******************************************************************************/
const char *progname = "check_nagios";
#include "popen.h"
#include "utils.h"
-void
-print_usage (void)
-{
- printf (_("\
-Usage: %s -F <status log file> -e <expire_minutes> -C <process_string>\n"),
- progname);
-}
-
-void
-print_help (void)
-{
- print_revision (progname, revision);
-
- printf (_(COPYRIGHT), copyright, email);
-
- printf (_("\
-This plugin attempts to check the status of the Nagios process on the local\n\
-machine. The plugin will check to make sure the Nagios status log is no older\n\
-than the number of minutes specified by the <expire_minutes> option. It also\n\
-uses the /bin/ps command to check for a process matching whatever you specify\n\
-by the <process_string> argument.\n"));
-
- print_usage ();
-
- printf (_(UT_HELP_VRSN));
-
- printf (_("\
--F, --filename=FILE\n\
- Name of the log file to check\n\
--e, --expires=INTEGER\n\
- Seconds aging afterwhich logfile is condsidered stale\n\
--C, --command=STRING\n\
- Command to search for in process table\n"));
-
- printf (_("\
-Example:\n\
- ./check_nagios -e 5 \\\
- -F /usr/local/nagios/var/status.log \\\
- -C /usr/local/nagios/bin/nagios\n"));
-}
-\f
int process_arguments (int, char **);
+void print_help (void);
+void print_usage (void);
char *status_log = NULL;
char *process_string = NULL;
char procprog[MAX_INPUT_BUFFER];
char *procargs;
int pos, cols;
+ int expected_cols = PS_COLS - 1;
+ const char *zombie = "Z";
+ char *temp_string;
+
+ setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
if (process_arguments (argc, argv) == ERROR)
- usage (_("Could not parse arguments\n"));
+ usage (_("check_nagios: could not parse arguments\n"));
/* Set signal handling and alarm */
if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
/* open the status log */
fp = fopen (status_log, "r");
if (fp == NULL) {
- printf (_("Error: Cannot open status log for reading!\n"));
+ printf (_("ERROR - Cannot open status log for reading!\n"));
return STATE_CRITICAL;
}
}
fclose (fp);
+ if (verbose >= 2)
+ printf("command: %s\n", PS_COMMAND);
+
/* run the command to check for the Nagios process.. */
child_process = spopen (PS_COMMAND);
if (child_process == NULL) {
/* count the number of matching Nagios processes... */
while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
cols = sscanf (input_buffer, PS_FORMAT, PS_VARLIST);
- if ( cols >= 6 ) {
+ /* Zombie processes do not give a procprog command */
+ if ( cols == (expected_cols - 1) && strstr(procstat, zombie) ) {
+ cols = expected_cols;
+ /* Set some value for procargs for the strip command further below
+ Seen to be a problem on some Solaris 7 and 8 systems */
+ input_buffer[pos] = '\n';
+ input_buffer[pos+1] = 0x0;
+ }
+ if ( cols >= expected_cols ) {
asprintf (&procargs, "%s", input_buffer + pos);
strip (procargs);
- if (!strstr(procargs, argv[0]) && strstr(procargs, process_string)) {
+ /* Some ps return full pathname for command. This removes path */
+ temp_string = strtok ((char *)procprog, "/");
+ while (temp_string) {
+ strcpy(procprog, temp_string);
+ temp_string = strtok (NULL, "/");
+ }
+
+ /* May get empty procargs */
+ if (!strstr(procargs, argv[0]) && strstr(procprog, process_string) && strcmp(procargs,"")) {
proc_entries++;
- if (verbose)
- printf (_("Found process: %s\n"), procargs);
+ if (verbose >= 2) {
+ printf (_("Found process: %s %s\n"), procprog, procargs);
+ }
}
}
}
-
-
/* process command-line arguments */
int
process_arguments (int argc, char **argv)
{
int c;
- int option_index = 0;
- static struct option long_options[] = {
+ int option = 0;
+ static struct option longopts[] = {
{"filename", required_argument, 0, 'F'},
{"expires", required_argument, 0, 'e'},
{"command", required_argument, 0, 'C'},
}
while (1) {
- c = getopt_long (argc, argv, "+hVvF:C:e:", long_options, &option_index);
+ c = getopt_long (argc, argv, "+hVvF:C:e:", longopts, &option);
if (c == -1 || c == EOF || c == 1)
break;
expire_minutes = atoi (optarg);
else
die (STATE_UNKNOWN,
- _("Expiration time must be an integer (seconds)\nType '%s -h' for additional help\n"),
- progname);
+ _("Expiration time must be an integer (seconds)\nType '%s -h' for additional help\n"),
+ progname);
break;
case 'v':
verbose++;
if (status_log == NULL)
die (STATE_UNKNOWN,
- _("You must provide the status_log\nType '%s -h' for additional help\n"),
- progname);
+ _("You must provide the status_log\nType '%s -h' for additional help\n"),
+ progname);
else if (process_string == NULL)
die (STATE_UNKNOWN,
_("You must provide a process string\nType '%s -h' for additional help\n"),
return OK;
}
+
+
+
+void
+print_help (void)
+{
+ print_revision (progname, revision);
+
+ printf (_(COPYRIGHT), copyright, email);
+
+ printf (_("\
+This plugin attempts to check the status of the Nagios process on the local\n\
+machine. The plugin will check to make sure the Nagios status log is no older\n\
+than the number of minutes specified by the <expire_minutes> option. It also\n\
+uses the /bin/ps command to check for a process matching whatever you specify\n\
+by the <process_string> argument.\n"));
+
+ print_usage ();
+
+ printf (_(UT_HELP_VRSN));
+
+ printf (_("\
+-F, --filename=FILE\n\
+ Name of the log file to check\n\
+-e, --expires=INTEGER\n\
+ Seconds aging afterwhich logfile is condsidered stale\n\
+-C, --command=STRING\n\
+ Command to search for in process table\n"));
+
+ printf (_("\
+Example:\n\
+ ./check_nagios -e 5 \\\
+ -F /usr/local/nagios/var/status.log \\\
+ -C /usr/local/nagios/bin/nagios\n"));
+}
+
+
+
+void
+print_usage (void)
+{
+ printf (_("\
+Usage: %s -F <status log file> -e <expire_minutes> -C <process_string>\n"),
+ progname);
+}