check_procs captures stderr and adds to plugin output. This is

from a merge of branch nagiosplug/branches/new_threshold_syntax 1979:1982

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@2019 f882894a-f735-0410-b71e-b25c423dba1c

diff --git a/NEWS b/NEWS
index 8185b55bc8dc9f7180e5283e43e0ff70009d46ae..64221524b47cb8c515fb25ff68d7e83ef0c50d64 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ This file documents the major additions and syntax changes between releases.
        Updated Nagios::Plugin to 0.27
        Fix Debian bug #479013: check_dig's -l is mandatory now (sf.net #1986306)
        check_dig now returns CRITICAL instead of WARNING when no answer section is found
+       check_procs now captures stderr in external command and adds to plugin output
 
 1.4.12 27th May 2008
        Added ./check_nt -v INSTANCES to count number of instances (Alessandro Ren)

diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index aaf055a9f0a86c228fe00daf85e2035b08f6d778..5ba2f55e56a2300fabe4941899e1ea6e1f46ec9c 100644 (file)
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -45,6 +45,7 @@
 #include "common.h"
 #include "utils_cmd.h"
 #include "utils_base.h"
+#include <fcntl.h>
 
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
@@ -377,3 +378,20 @@ cmd_run_array (char *const *argv, output * out, output * err, int flags)
 
        return _cmd_close (fd);
 }
+
+int
+cmd_file_read ( char *filename, output *out, int flags)
+{
+       int fd;
+       if(out)
+               memset (out, 0, sizeof(output));
+
+       if ((fd = open(filename, O_RDONLY)) == -1) {
+               die( STATE_UNKNOWN, _("Error opening %s: %s"), filename, strerror(errno) );
+       }
+       
+       if(out)
+               out->lines = _cmd_fetch_output (fd, out, flags);
+
+       return 0;
+}

diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h
index d54b2b4dcea181bb2fca2e51e525f1a5f83f23d9..8ebb58948aa0a035e3fabcf257cd1c8867a81a79 100644 (file)
--- a/lib/utils_cmd.h
+++ b/lib/utils_cmd.h
@@ -22,6 +22,7 @@ typedef struct output output;
 /** prototypes **/
 int cmd_run (const char *, output *, output *, int);
 int cmd_run_array (char *const *, output *, output *, int);
+int cmd_file_read (char *, output *, int);
 
 /* only multi-threaded plugins need to bother with this */
 void cmd_init (void);

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 67c49ca9453af0e3bd0e52ae751373061ee5df03..85e4a5dd2d0997b0658220489acb9d8badbcae4b 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -79,7 +79,7 @@ check_nwstat_LDADD = $(NETLIBS)
 check_overcr_LDADD = $(NETLIBS)
 check_pgsql_LDADD = $(NETLIBS) $(PGLIBS)
 check_ping_LDADD = $(NETLIBS) popen.o
-check_procs_LDADD = $(BASEOBJS) popen.o
+check_procs_LDADD = $(BASEOBJS)
 check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS)
 check_real_LDADD = $(NETLIBS)
 check_snmp_LDADD = $(BASEOBJS) popen.o

diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 875f867fe657d049d4b70c5e0b2369276a33cfd8..4aaeddb240bd89f8cb172cdaa18b1405a57dd228 100644 (file)
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -41,8 +41,8 @@ const char *copyright = "2000-2008";
 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>
@@ -129,8 +129,9 @@ main (int argc, char **argv)
        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);
@@ -153,41 +154,27 @@ main (int argc, char **argv)
        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);
 
        if (input_filename == NULL) {
-               ps_input = spopen (PS_COMMAND);
-               if (ps_input == NULL) {
-                       printf (_("Could not open pipe: %s\n"), PS_COMMAND);
-                       return STATE_UNKNOWN;
+               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);
                }
-               child_stderr = fdopen (child_stderr_array[fileno (ps_input)], "r");
-               if (child_stderr == NULL)
-                       printf (_("Could not open stderr for %s\n"), PS_COMMAND);
        } else {
-               ps_input = fopen(input_filename, "r");
-               if (ps_input == NULL) {
-                       die( STATE_UNKNOWN, _("Error opening %s\n"), input_filename );
-               }
+               result = cmd_file_read( input_filename, &chld_out, 0);
        }
 
-       /* flush first line */
-       fgets (input_buffer, MAX_INPUT_BUFFER - 1, ps_input);
-       while ( input_buffer[strlen(input_buffer)-1] != '\n' )
-               fgets (input_buffer, MAX_INPUT_BUFFER - 1, ps_input);
-
-       while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, ps_input)) {
-               asprintf (&input_line, "%s", input_buffer);
-               while ( input_buffer[strlen(input_buffer)-1] != '\n' ) {
-                       fgets (input_buffer, MAX_INPUT_BUFFER - 1, ps_input);
-                       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);
@@ -283,27 +270,9 @@ main (int argc, char **argv)
                }
        }
 
-       /* If we get anything on STDERR, at least set warning */
-       if (input_filename == NULL) {
-               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 (ps_input)) {
-                       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 )