![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 7dae8454bc18015e0fe346ae20eea93dd3c041b6..4aaeddb240bd89f8cb172cdaa18b1405a57dd228 100644 (file)
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
const char *email = "nagiosplug-devel@lists.sourceforge.net";
#include "common.h"
-#include "popen.h"
#include "utils.h"
+#include "utils_cmd.h"
#include "regex.h"
#include <pwd.h>
char *statopts;
char *prog;
char *args;
+char *input_filename = NULL;
regex_t re_args;
char *fmt;
char *fails;
char tmp[MAX_INPUT_BUFFER];
+FILE *ps_input = NULL;
int
int expected_cols = PS_COLS - 1;
int warn = 0; /* number of processes in warn state */
int crit = 0; /* number of processes in crit state */
- int i = 0;
+ int i = 0, j = 0;
int result = STATE_UNKNOWN;
+ output chld_out, chld_err;
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
asprintf (&metric_name, "PROCS");
metric = METRIC_PROCS;
+ /* Parse extra opts if any */
+ argv=np_extra_opts (&argc, argv, progname);
+
if (process_arguments (argc, argv) == ERROR)
usage4 (_("Could not parse arguments"));
mypid = getpid();
/* Set signal handling and alarm timeout */
- if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
- usage4 (_("Cannot catch SIGALRM"));
+ if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
+ die (STATE_UNKNOWN, _("Cannot catch SIGALRM"));
}
- alarm (timeout_interval);
+ (void) alarm ((unsigned) timeout_interval);
if (verbose >= 2)
printf (_("CMD: %s\n"), PS_COMMAND);
- child_process = spopen (PS_COMMAND);
- if (child_process == NULL) {
- printf (_("Could not open pipe: %s\n"), PS_COMMAND);
- return STATE_UNKNOWN;
+ if (input_filename == NULL) {
+ result = cmd_run( PS_COMMAND, &chld_out, &chld_err, 0);
+ if (chld_err.lines > 0) {
+ printf ("%s: %s", _("System call sent warnings to stderr"), chld_err.line[0]);
+ exit(STATE_WARNING);
+ }
+ } else {
+ result = cmd_file_read( input_filename, &chld_out, 0);
}
- child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
- if (child_stderr == NULL)
- printf (_("Could not open stderr for %s\n"), PS_COMMAND);
-
- /* flush first line */
- fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
- while ( input_buffer[strlen(input_buffer)-1] != '\n' )
- fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
-
- while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
- asprintf (&input_line, "%s", input_buffer);
- while ( input_buffer[strlen(input_buffer)-1] != '\n' ) {
- fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
- asprintf (&input_line, "%s%s", input_line, input_buffer);
- }
+ /* flush first line: j starts at 1 */
+ for (j = 1; j < chld_out.lines; j++) {
+ input_line = chld_out.line[j];
if (verbose >= 3)
printf ("%s", input_line);
}
}
- /* If we get anything on STDERR, at least set warning */
- while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
- if (verbose)
- printf ("STDERR: %s", input_buffer);
- result = max_state (result, STATE_WARNING);
- printf (_("System call sent warnings to stderr\n"));
- }
-
- (void) fclose (child_stderr);
-
- /* close the pipe */
- if (spclose (child_process)) {
- printf (_("System call returned nonzero status\n"));
- result = max_state (result, STATE_WARNING);
- }
-
if (found == 0) { /* no process lines parsed so return STATE_UNKNOWN */
printf (_("Unable to read output\n"));
- return result;
+ return STATE_UNKNOWN;
}
if ( result == STATE_UNKNOWN )
{"version", no_argument, 0, 'V'},
{"verbose", no_argument, 0, 'v'},
{"ereg-argument-array", required_argument, 0, CHAR_MAX+1},
+ {"input-file", required_argument, 0, CHAR_MAX+2},
{0, 0, 0, 0}
};
case 'v': /* command */
verbose++;
break;
+ case CHAR_MAX+2:
+ input_filename = optarg;
+ break;
}
}
{
print_revision (progname, revision);
- printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>");
+ printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
printf ("%s\n", _("Checks all processes and generates WARNING or CRITICAL states if the specified"));
printf ("%s\n", _("of processes. Search filters can be applied to limit the processes to check."));
printf ("\n\n");
-
+
print_usage ();
- printf ("%s\n", _("Required Arguments:"));
+ printf (_(UT_HELP_VRSN));
+ printf (_(UT_EXTRA_OPTS));
printf (" %s\n", "-w, --warning=RANGE");
printf (" %s\n", _("Generate warning state if metric is outside this range"));
printf (" %s\n", "-c, --critical=RANGE");
printf (" %s\n", _("Generate critical state if metric is outside this range"));
-
- printf ("%s\n", _("Optional Arguments:"));
printf (" %s\n", "-m, --metric=TYPE");
printf (" %s\n", _("Check thresholds against metric. Valid types:"));
printf (" %s\n", _("PROCS - number of processes (default)"));
printf (" %s\n", "-v, --verbose");
printf (" %s\n", _("Extra information. Up to 3 verbosity levels"));
- printf ("%s\n", "Optional Filters:");
+ printf ("\n");
+ printf ("%s\n", "Filters:");
printf (" %s\n", "-s, --state=STATUSFLAGS");
printf (" %s\n", _("Only scan for processes that have, in the output of `ps`, one or"));
printf (" %s\n", _("more of the status flags you specify (for example R, Z, S, RS,"));
process owner, parent process PID, current state (e.g., 'Z'), or may\n\
be the total number of running processes\n\n"));
+#ifdef NP_EXTRA_OPTS
+ printf ("%s\n", _("Notes:"));
+ printf (_(UT_EXTRA_OPTS_NOTES));
+ printf ("\n");
+#endif
+
printf ("%s\n", _("Examples:"));
printf (" %s\n", "check_procs -w 2:2 -c 2:1024 -C portsentry");
printf (" %s\n", _("Warning if not two processes with command name portsentry."));
printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ");
printf (" %s\n\n", _("Alert if vsz of any processes over 50K or 100K"));
printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
- printf (" %s\n\n", _("Alert if cpu of any processes over 10%% or 20%%"));
+ printf (" %s\n", _("Alert if cpu of any processes over 10%% or 20%%"));
printf (_(UT_SUPPORT));
}