From c71a2e414ff3716325a6f4ce715e4a3037d52c0e Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Wed, 12 Mar 2025 13:54:00 +0100 Subject: check_procs: clang-format --- plugins/check_procs.c | 843 +++++++++++++++++++++++++------------------------- 1 file changed, 422 insertions(+), 421 deletions(-) (limited to 'plugins/check_procs.c') diff --git a/plugins/check_procs.c b/plugins/check_procs.c index 1d78ccee..69b424dc 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c @@ -1,41 +1,41 @@ /***************************************************************************** -* -* Monitoring check_procs plugin -* -* License: GPL -* Copyright (c) 2000-2024 Monitoring Plugins Development Team -* -* Description: -* -* This file contains the check_procs plugin -* -* Checks all processes and generates WARNING or CRITICAL states if the -* specified metric is outside the required threshold ranges. The metric -* defaults to number of processes. Search filters can be applied to limit -* the processes to check. -* -* The parent process, check_procs itself and any child process of -* check_procs (ps) are excluded from any checks to prevent false positives. -* -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* -* -*****************************************************************************/ + * + * Monitoring check_procs plugin + * + * License: GPL + * Copyright (c) 2000-2024 Monitoring Plugins Development Team + * + * Description: + * + * This file contains the check_procs plugin + * + * Checks all processes and generates WARNING or CRITICAL states if the + * specified metric is outside the required threshold ranges. The metric + * defaults to number of processes. Search filters can be applied to limit + * the processes to check. + * + * The parent process, check_procs itself and any child process of + * check_procs (ps) are excluded from any checks to prevent false positives. + * + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * + *****************************************************************************/ const char *progname = "check_procs"; -const char *program_name = "check_procs"; /* Required for coreutils libs */ +const char *program_name = "check_procs"; /* Required for coreutils libs */ const char *copyright = "2000-2024"; const char *email = "devel@monitoring-plugins.org"; @@ -48,35 +48,36 @@ const char *email = "devel@monitoring-plugins.org"; #include #ifdef HAVE_SYS_STAT_H -#include +# include #endif -static int process_arguments (int /*argc*/, char ** /*argv*/); -static int validate_arguments (void); -static int convert_to_seconds (char * /*etime*/); -static void print_help (void); -void print_usage (void); +static int process_arguments(int /*argc*/, char ** /*argv*/); +static int validate_arguments(void); +static int convert_to_seconds(char * /*etime*/); +static void print_help(void); +void print_usage(void); static char *warning_range = NULL; static char *critical_range = NULL; static thresholds *procs_thresholds = NULL; static int options = 0; /* bitmask of filter criteria to test against */ -#define ALL 1 -#define STAT 2 -#define PPID 4 -#define USER 8 -#define PROG 16 -#define ARGS 32 -#define VSZ 64 -#define RSS 128 -#define PCPU 256 -#define ELAPSED 512 -#define EREG_ARGS 1024 +#define ALL 1 +#define STAT 2 +#define PPID 4 +#define USER 8 +#define PROG 16 +#define ARGS 32 +#define VSZ 64 +#define RSS 128 +#define PCPU 256 +#define ELAPSED 512 +#define EREG_ARGS 1024 #define EXCLUDE_PROGS 2048 -#define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads: - ppid of procs are compared to pid of this proc*/ +#define KTHREAD_PARENT \ + "kthreadd" /* the parent process of kernel threads: \ + ppid of procs are compared to pid of this proc*/ /* Different metrics */ char *metric_name; @@ -109,8 +110,7 @@ static char tmp[MAX_INPUT_BUFFER]; static int kthread_filter = 0; static int usepid = 0; /* whether to test for pid or /proc/pid/exe */ -static int -stat_exe (const pid_t pid, struct stat *buf) { +static int stat_exe(const pid_t pid, struct stat *buf) { char *path; int ret; xasprintf(&path, "/proc/%d/exe", pid); @@ -119,10 +119,7 @@ stat_exe (const pid_t pid, struct stat *buf) { return ret; } - -int -main (int argc, char **argv) -{ +int main(int argc, char **argv) { char *input_buffer; char *input_line; char *procprog; @@ -141,16 +138,16 @@ main (int argc, char **argv) int procseconds = 0; float procpcpu = 0; char procstat[8]; - char procetime[MAX_INPUT_BUFFER] = { '\0' }; + char procetime[MAX_INPUT_BUFFER] = {'\0'}; char *procargs; const char *zombie = "Z"; int resultsum = 0; /* bitmask of the filter criteria met by a process */ - int found = 0; /* counter for number of lines returned in `ps` output */ - int procs = 0; /* counter for number of processes meeting filter criteria */ - int pos; /* number of spaces before 'args' in `ps` output */ - int cols; /* number of columns in ps output */ + int found = 0; /* counter for number of lines returned in `ps` output */ + int procs = 0; /* counter for number of processes meeting filter criteria */ + int pos; /* number of spaces before 'args' in `ps` output */ + int cols; /* number of columns in ps output */ int expected_cols = PS_COLS - 1; int warn = 0; /* number of processes in warn state */ int crit = 0; /* number of processes in crit state */ @@ -159,22 +156,23 @@ main (int argc, char **argv) int ret = 0; output chld_out, chld_err; - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); setlocale(LC_NUMERIC, "POSIX"); - input_buffer = malloc (MAX_INPUT_BUFFER); - procprog = malloc (MAX_INPUT_BUFFER); + input_buffer = malloc(MAX_INPUT_BUFFER); + procprog = malloc(MAX_INPUT_BUFFER); - xasprintf (&metric_name, "PROCS"); + xasprintf(&metric_name, "PROCS"); metric = METRIC_PROCS; /* Parse extra opts if any */ - argv=np_extra_opts (&argc, argv, progname); + argv = np_extra_opts(&argc, argv, progname); - if (process_arguments (argc, argv) == ERROR) - usage4 (_("Could not parse arguments")); + if (process_arguments(argc, argv) == ERROR) { + usage4(_("Could not parse arguments")); + } /* find ourself */ mypid = getpid(); @@ -189,44 +187,46 @@ main (int argc, char **argv) } /* Set signal handling and alarm timeout */ - if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) { - die (STATE_UNKNOWN, _("Cannot catch SIGALRM")); + if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) { + die(STATE_UNKNOWN, _("Cannot catch SIGALRM")); } - (void) alarm ((unsigned) timeout_interval); + (void)alarm((unsigned)timeout_interval); - if (verbose >= 2) - printf (_("CMD: %s\n"), PS_COMMAND); + if (verbose >= 2) { + printf(_("CMD: %s\n"), PS_COMMAND); + } if (input_filename == NULL) { - result = cmd_run( PS_COMMAND, &chld_out, &chld_err, 0); + 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]); + 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); + result = cmd_file_read(input_filename, &chld_out, 0); } /* flush first line: j starts at 1 */ for (size_t j = 1; j < chld_out.lines; j++) { input_line = chld_out.line[j]; - if (verbose >= 3) - printf ("%s", input_line); + if (verbose >= 3) { + printf("%s", input_line); + } - strcpy (procprog, ""); - xasprintf (&procargs, "%s", ""); + strcpy(procprog, ""); + xasprintf(&procargs, "%s", ""); - cols = sscanf (input_line, PS_FORMAT, PS_VARLIST); + cols = sscanf(input_line, PS_FORMAT, PS_VARLIST); /* Zombie processes do not give a procprog command */ - if ( cols < expected_cols && strstr(procstat, zombie) ) { + if (cols < expected_cols && strstr(procstat, zombie)) { cols = expected_cols; } - if ( cols >= expected_cols ) { + if (cols >= expected_cols) { resultsum = 0; - xasprintf (&procargs, "%s", input_line + pos); - strip (procargs); + xasprintf(&procargs, "%s", input_line + pos); + strip(procargs); /* Some ps return full pathname for command. This removes path */ strcpy(procprog, base_name(procprog)); @@ -234,52 +234,53 @@ main (int argc, char **argv) /* we need to convert the elapsed time to seconds */ procseconds = convert_to_seconds(procetime); - if (verbose >= 3) - printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", - procs, procuid, procvsz, procrss, - procpid, procppid, procpcpu, procstat, - procetime, procprog, procargs); + if (verbose >= 3) { + printf("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", procs, procuid, procvsz, + procrss, procpid, procppid, procpcpu, procstat, procetime, procprog, procargs); + } /* Ignore self */ if ((usepid && mypid == procpid) || - ( ((!usepid) && ((ret = stat_exe(procpid, &statbuf) != -1) && statbuf.st_dev == mydev && statbuf.st_ino == myino)) || - (ret == -1 && errno == ENOENT)) - ) { - if (verbose >= 3) - printf("not considering - is myself or gone\n"); + (((!usepid) && ((ret = stat_exe(procpid, &statbuf) != -1) && statbuf.st_dev == mydev && statbuf.st_ino == myino)) || + (ret == -1 && errno == ENOENT))) { + if (verbose >= 3) { + printf("not considering - is myself or gone\n"); + } continue; } /* Ignore parent*/ else if (myppid == procpid) { - if (verbose >= 3) - printf("not considering - is parent\n"); + if (verbose >= 3) { + printf("not considering - is parent\n"); + } continue; } /* Ignore our own children */ if (procppid == mypid) { - if (verbose >= 3) - printf("not considering - is our child\n"); + if (verbose >= 3) { + printf("not considering - is our child\n"); + } continue; } /* Ignore excluded processes by name */ - if(options & EXCLUDE_PROGS) { - int found = 0; - int i = 0; - - for(i=0; i < (exclude_progs_counter); i++) { - if(!strcmp(procprog, exclude_progs_arr[i])) { - found = 1; - } - } - if(found == 0) { - resultsum |= EXCLUDE_PROGS; - } else - { - if(verbose >= 3) - printf("excluding - by ignorelist\n"); - } + if (options & EXCLUDE_PROGS) { + int found = 0; + int i = 0; + + for (i = 0; i < (exclude_progs_counter); i++) { + if (!strcmp(procprog, exclude_progs_arr[i])) { + found = 1; + } + } + if (found == 0) { + resultsum |= EXCLUDE_PROGS; + } else { + if (verbose >= 3) { + printf("excluding - by ignorelist\n"); + } + } } /* filter kernel threads (children of KTHREAD_PARENT)*/ @@ -287,69 +288,81 @@ main (int argc, char **argv) sorry for not doing that, but I've no other OSes to test :-( */ if (kthread_filter == 1) { /* get pid KTHREAD_PARENT */ - if (kthread_ppid == 0 && !strcmp(procprog, KTHREAD_PARENT) ) + if (kthread_ppid == 0 && !strcmp(procprog, KTHREAD_PARENT)) { kthread_ppid = procpid; + } if (kthread_ppid == procppid) { - if (verbose >= 2) - printf ("Ignore kernel thread: pid=%d ppid=%d prog=%s args=%s\n", procpid, procppid, procprog, procargs); + if (verbose >= 2) { + printf("Ignore kernel thread: pid=%d ppid=%d prog=%s args=%s\n", procpid, procppid, procprog, procargs); + } continue; } } - if ((options & STAT) && (strstr (procstat, statopts))) + if ((options & STAT) && (strstr(procstat, statopts))) { resultsum |= STAT; - if ((options & ARGS) && procargs && (strstr (procargs, args) != NULL)) + } + if ((options & ARGS) && procargs && (strstr(procargs, args) != NULL)) { resultsum |= ARGS; - if ((options & EREG_ARGS) && procargs && (regexec(&re_args, procargs, (size_t) 0, NULL, 0) == 0)) + } + if ((options & EREG_ARGS) && procargs && (regexec(&re_args, procargs, (size_t)0, NULL, 0) == 0)) { resultsum |= EREG_ARGS; - if ((options & PROG) && procprog && (strcmp (prog, procprog) == 0)) + } + if ((options & PROG) && procprog && (strcmp(prog, procprog) == 0)) { resultsum |= PROG; - if ((options & PPID) && (procppid == ppid)) + } + if ((options & PPID) && (procppid == ppid)) { resultsum |= PPID; - if ((options & USER) && (procuid == uid)) + } + if ((options & USER) && (procuid == uid)) { resultsum |= USER; - if ((options & VSZ) && (procvsz >= vsz)) + } + if ((options & VSZ) && (procvsz >= vsz)) { resultsum |= VSZ; - if ((options & RSS) && (procrss >= rss)) + } + if ((options & RSS) && (procrss >= rss)) { resultsum |= RSS; - if ((options & PCPU) && (procpcpu >= pcpu)) + } + if ((options & PCPU) && (procpcpu >= pcpu)) { resultsum |= PCPU; + } found++; /* Next line if filters not matched */ - if (!(options == resultsum || options == ALL)) + if (!(options == resultsum || options == ALL)) { continue; + } procs++; if (verbose >= 2) { - printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", - procuid, procvsz, procrss, - procpid, procppid, procpcpu, procstat, - procetime, procprog, procargs); + printf("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", procuid, procvsz, + procrss, procpid, procppid, procpcpu, procstat, procetime, procprog, procargs); } - if (metric == METRIC_VSZ) - i = get_status ((double)procvsz, procs_thresholds); - else if (metric == METRIC_RSS) - i = get_status ((double)procrss, procs_thresholds); + if (metric == METRIC_VSZ) { + i = get_status((double)procvsz, procs_thresholds); + } else if (metric == METRIC_RSS) { + i = get_status((double)procrss, procs_thresholds); + } /* TODO? float thresholds for --metric=CPU */ - else if (metric == METRIC_CPU) - i = get_status (procpcpu, procs_thresholds); - else if (metric == METRIC_ELAPSED) - i = get_status ((double)procseconds, procs_thresholds); + else if (metric == METRIC_CPU) { + i = get_status(procpcpu, procs_thresholds); + } else if (metric == METRIC_ELAPSED) { + i = get_status((double)procseconds, procs_thresholds); + } if (metric != METRIC_PROCS) { if (i == STATE_WARNING) { warn++; - xasprintf (&fails, "%s%s%s", fails, (strcmp(fails,"") ? ", " : ""), procprog); - result = max_state (result, i); + xasprintf(&fails, "%s%s%s", fails, (strcmp(fails, "") ? ", " : ""), procprog); + result = max_state(result, i); } if (i == STATE_CRITICAL) { crit++; - xasprintf (&fails, "%s%s%s", fails, (strcmp(fails,"") ? ", " : ""), procprog); - result = max_state (result, i); + xasprintf(&fails, "%s%s%s", fails, (strcmp(fails, "") ? ", " : ""), procprog); + result = max_state(result, i); } } } @@ -359,58 +372,55 @@ main (int argc, char **argv) } } - if (found == 0) { /* no process lines parsed so return STATE_UNKNOWN */ - printf (_("Unable to read output\n")); + if (found == 0) { /* no process lines parsed so return STATE_UNKNOWN */ + printf(_("Unable to read output\n")); return STATE_UNKNOWN; } - if ( result == STATE_UNKNOWN ) + if (result == STATE_UNKNOWN) { result = STATE_OK; + } /* Needed if procs found, but none match filter */ - if ( metric == METRIC_PROCS ) { - result = max_state (result, get_status ((double)procs, procs_thresholds) ); + if (metric == METRIC_PROCS) { + result = max_state(result, get_status((double)procs, procs_thresholds)); } - if ( result == STATE_OK ) { - printf ("%s %s: ", metric_name, _("OK")); + if (result == STATE_OK) { + printf("%s %s: ", metric_name, _("OK")); } else if (result == STATE_WARNING) { - printf ("%s %s: ", metric_name, _("WARNING")); - if ( metric != METRIC_PROCS ) { - printf (_("%d warn out of "), warn); + printf("%s %s: ", metric_name, _("WARNING")); + if (metric != METRIC_PROCS) { + printf(_("%d warn out of "), warn); } } else if (result == STATE_CRITICAL) { - printf ("%s %s: ", metric_name, _("CRITICAL")); + printf("%s %s: ", metric_name, _("CRITICAL")); if (metric != METRIC_PROCS) { - printf (_("%d crit, %d warn out of "), crit, warn); + printf(_("%d crit, %d warn out of "), crit, warn); } } - printf (ngettext ("%d process", "%d processes", (unsigned long) procs), procs); + printf(ngettext("%d process", "%d processes", (unsigned long)procs), procs); - if (strcmp(fmt,"") != 0) { - printf (_(" with %s"), fmt); + if (strcmp(fmt, "") != 0) { + printf(_(" with %s"), fmt); } - if ( verbose >= 1 && strcmp(fails,"") ) - printf (" [%s]", fails); + if (verbose >= 1 && strcmp(fails, "")) { + printf(" [%s]", fails); + } - if (metric == METRIC_PROCS) - printf (" | procs=%d;%s;%s;0;", procs, - warning_range ? warning_range : "", - critical_range ? critical_range : ""); - else - printf (" | procs=%d;;;0; procs_warn=%d;;;0; procs_crit=%d;;;0;", procs, warn, crit); + if (metric == METRIC_PROCS) { + printf(" | procs=%d;%s;%s;0;", procs, warning_range ? warning_range : "", critical_range ? critical_range : ""); + } else { + printf(" | procs=%d;;;0; procs_warn=%d;;;0; procs_crit=%d;;;0;", procs, warn, crit); + } - printf ("\n"); + printf("\n"); return result; } - - /* process command-line arguments */ -int -process_arguments (int argc, char **argv) -{ +int process_arguments(int argc, char **argv) { int c = 1; char *user; struct passwd *pw; @@ -419,260 +429,262 @@ process_arguments (int argc, char **argv) int cflags = REG_NOSUB | REG_EXTENDED; char errbuf[MAX_INPUT_BUFFER]; char *temp_string; - int i=0; - static struct option longopts[] = { - {"warning", required_argument, 0, 'w'}, - {"critical", required_argument, 0, 'c'}, - {"metric", required_argument, 0, 'm'}, - {"timeout", required_argument, 0, 't'}, - {"status", required_argument, 0, 's'}, - {"ppid", required_argument, 0, 'p'}, - {"user", required_argument, 0, 'u'}, - {"command", required_argument, 0, 'C'}, - {"vsz", required_argument, 0, 'z'}, - {"rss", required_argument, 0, 'r'}, - {"pcpu", required_argument, 0, 'P'}, - {"elapsed", required_argument, 0, 'e'}, - {"argument-array", required_argument, 0, 'a'}, - {"help", no_argument, 0, 'h'}, - {"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}, - {"no-kthreads", required_argument, 0, 'k'}, - {"traditional-filter", no_argument, 0, 'T'}, - {"exclude-process", required_argument, 0, 'X'}, - {0, 0, 0, 0} - }; - - for (c = 1; c < argc; c++) - if (strcmp ("-to", argv[c]) == 0) - strcpy (argv[c], "-t"); + int i = 0; + static struct option longopts[] = {{"warning", required_argument, 0, 'w'}, + {"critical", required_argument, 0, 'c'}, + {"metric", required_argument, 0, 'm'}, + {"timeout", required_argument, 0, 't'}, + {"status", required_argument, 0, 's'}, + {"ppid", required_argument, 0, 'p'}, + {"user", required_argument, 0, 'u'}, + {"command", required_argument, 0, 'C'}, + {"vsz", required_argument, 0, 'z'}, + {"rss", required_argument, 0, 'r'}, + {"pcpu", required_argument, 0, 'P'}, + {"elapsed", required_argument, 0, 'e'}, + {"argument-array", required_argument, 0, 'a'}, + {"help", no_argument, 0, 'h'}, + {"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}, + {"no-kthreads", required_argument, 0, 'k'}, + {"traditional-filter", no_argument, 0, 'T'}, + {"exclude-process", required_argument, 0, 'X'}, + {0, 0, 0, 0}}; + + for (c = 1; c < argc; c++) { + if (strcmp("-to", argv[c]) == 0) { + strcpy(argv[c], "-t"); + } + } while (1) { - c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T:X:", - longopts, &option); + c = getopt_long(argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T:X:", longopts, &option); - if (c == -1 || c == EOF) + if (c == -1 || c == EOF) { break; + } switch (c) { - case '?': /* help */ - usage5 (); - case 'h': /* help */ - print_help (); - exit (STATE_UNKNOWN); - case 'V': /* version */ - print_revision (progname, NP_VERSION); - exit (STATE_UNKNOWN); - case 't': /* timeout period */ - if (!is_integer (optarg)) - usage2 (_("Timeout interval must be a positive integer"), optarg); - else - timeout_interval = atoi (optarg); + case '?': /* help */ + usage5(); + case 'h': /* help */ + print_help(); + exit(STATE_UNKNOWN); + case 'V': /* version */ + print_revision(progname, NP_VERSION); + exit(STATE_UNKNOWN); + case 't': /* timeout period */ + if (!is_integer(optarg)) { + usage2(_("Timeout interval must be a positive integer"), optarg); + } else { + timeout_interval = atoi(optarg); + } break; - case 'c': /* critical threshold */ + case 'c': /* critical threshold */ critical_range = optarg; break; - case 'w': /* warning threshold */ + case 'w': /* warning threshold */ warning_range = optarg; break; - case 'p': /* process id */ - if (sscanf (optarg, "%d%[^0-9]", &ppid, tmp) == 1) { - xasprintf (&fmt, "%s%sPPID = %d", (fmt ? fmt : "") , (options ? ", " : ""), ppid); + case 'p': /* process id */ + if (sscanf(optarg, "%d%[^0-9]", &ppid, tmp) == 1) { + xasprintf(&fmt, "%s%sPPID = %d", (fmt ? fmt : ""), (options ? ", " : ""), ppid); options |= PPID; break; } - usage4 (_("Parent Process ID must be an integer!")); - case 's': /* status */ - if (statopts) + usage4(_("Parent Process ID must be an integer!")); + case 's': /* status */ + if (statopts) { break; - else + } else { statopts = optarg; - xasprintf (&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts); + } + xasprintf(&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts); options |= STAT; break; - case 'u': /* user or user id */ - if (is_integer (optarg)) { - uid = atoi (optarg); - pw = getpwuid ((uid_t) uid); + case 'u': /* user or user id */ + if (is_integer(optarg)) { + uid = atoi(optarg); + pw = getpwuid((uid_t)uid); /* check to be sure user exists */ - if (pw == NULL) - usage2 (_("UID was not found"), optarg); - } - else { - pw = getpwnam (optarg); + if (pw == NULL) { + usage2(_("UID was not found"), optarg); + } + } else { + pw = getpwnam(optarg); /* check to be sure user exists */ - if (pw == NULL) - usage2 (_("User name was not found"), optarg); + if (pw == NULL) { + usage2(_("User name was not found"), optarg); + } /* then get uid */ uid = pw->pw_uid; } user = pw->pw_name; - xasprintf (&fmt, "%s%sUID = %d (%s)", (fmt ? fmt : ""), (options ? ", " : ""), - uid, user); + xasprintf(&fmt, "%s%sUID = %d (%s)", (fmt ? fmt : ""), (options ? ", " : ""), uid, user); options |= USER; break; - case 'C': /* command */ + case 'C': /* command */ /* TODO: allow this to be passed in with --metric */ - if (prog) + if (prog) { break; - else + } else { prog = optarg; - xasprintf (&fmt, _("%s%scommand name '%s'"), (fmt ? fmt : ""), (options ? ", " : ""), - prog); + } + xasprintf(&fmt, _("%s%scommand name '%s'"), (fmt ? fmt : ""), (options ? ", " : ""), prog); options |= PROG; break; case 'X': - if(exclude_progs) - break; - else - exclude_progs = optarg; - xasprintf (&fmt, _("%s%sexclude progs '%s'"), (fmt ? fmt : ""), (options ? ", " : ""), - exclude_progs); + if (exclude_progs) { + break; + } else { + exclude_progs = optarg; + } + xasprintf(&fmt, _("%s%sexclude progs '%s'"), (fmt ? fmt : ""), (options ? ", " : ""), exclude_progs); char *p = strtok(exclude_progs, ","); - while(p){ - exclude_progs_arr = realloc(exclude_progs_arr, sizeof(char*) * ++exclude_progs_counter); - exclude_progs_arr[exclude_progs_counter-1] = p; - p = strtok(NULL, ","); + while (p) { + exclude_progs_arr = realloc(exclude_progs_arr, sizeof(char *) * ++exclude_progs_counter); + exclude_progs_arr[exclude_progs_counter - 1] = p; + p = strtok(NULL, ","); } options |= EXCLUDE_PROGS; break; - case 'a': /* args (full path name with args) */ + case 'a': /* args (full path name with args) */ /* TODO: allow this to be passed in with --metric */ - if (args) + if (args) { break; - else + } else { args = optarg; - xasprintf (&fmt, "%s%sargs '%s'", (fmt ? fmt : ""), (options ? ", " : ""), args); + } + xasprintf(&fmt, "%s%sargs '%s'", (fmt ? fmt : ""), (options ? ", " : ""), args); options |= ARGS; break; - case CHAR_MAX+1: + case CHAR_MAX + 1: err = regcomp(&re_args, optarg, cflags); if (err != 0) { - regerror (err, &re_args, errbuf, MAX_INPUT_BUFFER); - die (STATE_UNKNOWN, "PROCS %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf); + regerror(err, &re_args, errbuf, MAX_INPUT_BUFFER); + die(STATE_UNKNOWN, "PROCS %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf); } /* Strip off any | within the regex optarg */ temp_string = strdup(optarg); - while(temp_string[i]!='\0'){ - if(temp_string[i]=='|') - temp_string[i]=','; + while (temp_string[i] != '\0') { + if (temp_string[i] == '|') { + temp_string[i] = ','; + } i++; } - xasprintf (&fmt, "%s%sregex args '%s'", (fmt ? fmt : ""), (options ? ", " : ""), temp_string); + xasprintf(&fmt, "%s%sregex args '%s'", (fmt ? fmt : ""), (options ? ", " : ""), temp_string); options |= EREG_ARGS; break; - case 'r': /* RSS */ - if (sscanf (optarg, "%d%[^0-9]", &rss, tmp) == 1) { - xasprintf (&fmt, "%s%sRSS >= %d", (fmt ? fmt : ""), (options ? ", " : ""), rss); + case 'r': /* RSS */ + if (sscanf(optarg, "%d%[^0-9]", &rss, tmp) == 1) { + xasprintf(&fmt, "%s%sRSS >= %d", (fmt ? fmt : ""), (options ? ", " : ""), rss); options |= RSS; break; } - usage4 (_("RSS must be an integer!")); - case 'z': /* VSZ */ - if (sscanf (optarg, "%d%[^0-9]", &vsz, tmp) == 1) { - xasprintf (&fmt, "%s%sVSZ >= %d", (fmt ? fmt : ""), (options ? ", " : ""), vsz); + usage4(_("RSS must be an integer!")); + case 'z': /* VSZ */ + if (sscanf(optarg, "%d%[^0-9]", &vsz, tmp) == 1) { + xasprintf(&fmt, "%s%sVSZ >= %d", (fmt ? fmt : ""), (options ? ", " : ""), vsz); options |= VSZ; break; } - usage4 (_("VSZ must be an integer!")); - case 'P': /* PCPU */ + usage4(_("VSZ must be an integer!")); + case 'P': /* PCPU */ /* TODO: -P 1.5.5 is accepted */ - if (sscanf (optarg, "%f%[^0-9.]", &pcpu, tmp) == 1) { - xasprintf (&fmt, "%s%sPCPU >= %.2f", (fmt ? fmt : ""), (options ? ", " : ""), pcpu); + if (sscanf(optarg, "%f%[^0-9.]", &pcpu, tmp) == 1) { + xasprintf(&fmt, "%s%sPCPU >= %.2f", (fmt ? fmt : ""), (options ? ", " : ""), pcpu); options |= PCPU; break; } - usage4 (_("PCPU must be a float!")); + usage4(_("PCPU must be a float!")); case 'm': - xasprintf (&metric_name, "%s", optarg); - if ( strcmp(optarg, "PROCS") == 0) { + xasprintf(&metric_name, "%s", optarg); + if (strcmp(optarg, "PROCS") == 0) { metric = METRIC_PROCS; break; - } - else if ( strcmp(optarg, "VSZ") == 0) { + } else if (strcmp(optarg, "VSZ") == 0) { metric = METRIC_VSZ; break; - } - else if ( strcmp(optarg, "RSS") == 0 ) { + } else if (strcmp(optarg, "RSS") == 0) { metric = METRIC_RSS; break; - } - else if ( strcmp(optarg, "CPU") == 0 ) { + } else if (strcmp(optarg, "CPU") == 0) { metric = METRIC_CPU; break; - } - else if ( strcmp(optarg, "ELAPSED") == 0) { + } else if (strcmp(optarg, "ELAPSED") == 0) { metric = METRIC_ELAPSED; break; } - usage4 (_("Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!")); - case 'k': /* linux kernel thread filter */ + usage4(_("Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!")); + case 'k': /* linux kernel thread filter */ kthread_filter = 1; break; - case 'v': /* command */ + case 'v': /* command */ verbose++; break; case 'T': usepid = 1; break; - case CHAR_MAX+2: + case CHAR_MAX + 2: input_filename = optarg; break; } } c = optind; - if ((! warning_range) && argv[c]) + if ((!warning_range) && argv[c]) { warning_range = argv[c++]; - if ((! critical_range) && argv[c]) + } + if ((!critical_range) && argv[c]) { critical_range = argv[c++]; + } if (statopts == NULL && argv[c]) { - xasprintf (&statopts, "%s", argv[c++]); - xasprintf (&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts); + xasprintf(&statopts, "%s", argv[c++]); + xasprintf(&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts); options |= STAT; } /* this will abort in case of invalid ranges */ - set_thresholds (&procs_thresholds, warning_range, critical_range); + set_thresholds(&procs_thresholds, warning_range, critical_range); - return validate_arguments (); + return validate_arguments(); } - - -int -validate_arguments () -{ - if (options == 0) +int validate_arguments() { + if (options == 0) { options = ALL; + } - if (statopts==NULL) + if (statopts == NULL) { statopts = strdup(""); + } - if (prog==NULL) + if (prog == NULL) { prog = strdup(""); + } - if (args==NULL) + if (args == NULL) { args = strdup(""); + } - if (fmt==NULL) + if (fmt == NULL) { fmt = strdup(""); + } - if (fails==NULL) + if (fails == NULL) { fails = strdup(""); + } return options; } - /* convert the elapsed time to seconds */ -int -convert_to_seconds(char *etime) { +int convert_to_seconds(char *etime) { char *ptr; int total; @@ -704,8 +716,7 @@ convert_to_seconds(char *etime) { } if (hyphcnt > 0) { - sscanf(etime, "%d-%d:%d:%d", - &days, &hours, &minutes, &seconds); + sscanf(etime, "%d-%d:%d:%d", &days, &hours, &minutes, &seconds); /* linux 2.6.5/2.6.6 reporting some processes with infinite * elapsed times for some reason */ if (days == 49710) { @@ -713,135 +724,125 @@ convert_to_seconds(char *etime) { } } else { if (coloncnt == 2) { - sscanf(etime, "%d:%d:%d", - &hours, &minutes, &seconds); + sscanf(etime, "%d:%d:%d", &hours, &minutes, &seconds); } else if (coloncnt == 1) { - sscanf(etime, "%d:%d", - &minutes, &seconds); + sscanf(etime, "%d:%d", &minutes, &seconds); } } - total = (days * 86400) + - (hours * 3600) + - (minutes * 60) + - seconds; + total = (days * 86400) + (hours * 3600) + (minutes * 60) + seconds; if (verbose >= 3 && metric == METRIC_ELAPSED) { - printf("seconds: %d\n", total); + printf("seconds: %d\n", total); } return total; } +void print_help(void) { + print_revision(progname, NP_VERSION); -void -print_help (void) -{ - print_revision (progname, NP_VERSION); - - printf ("Copyright (c) 1999 Ethan Galstad \n"); - printf (COPYRIGHT, copyright, email); + printf("Copyright (c) 1999 Ethan Galstad \n"); + printf(COPYRIGHT, copyright, email); - printf ("%s\n", _("Checks all processes and generates WARNING or CRITICAL states if the specified")); - printf ("%s\n", _("metric is outside the required threshold ranges. The metric defaults to number")); - printf ("%s\n", _("of processes. Search filters can be applied to limit the processes to check.")); + printf("%s\n", _("Checks all processes and generates WARNING or CRITICAL states if the specified")); + printf("%s\n", _("metric is outside the required threshold ranges. The metric defaults to number")); + printf("%s\n", _("of processes. Search filters can be applied to limit the processes to check.")); - printf ("\n\n"); + printf("\n\n"); - printf ("%s\n", _("The parent process, check_procs itself and any child process of check_procs (ps)")); - printf ("%s\n", _("are excluded from any checks to prevent false positives.")); + printf("%s\n", _("The parent process, check_procs itself and any child process of check_procs (ps)")); + printf("%s\n", _("are excluded from any checks to prevent false positives.")); - printf ("\n\n"); + printf("\n\n"); - print_usage (); + print_usage(); - 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", "-m, --metric=TYPE"); - printf (" %s\n", _("Check thresholds against metric. Valid types:")); - printf (" %s\n", _("PROCS - number of processes (default)")); - printf (" %s\n", _("VSZ - virtual memory size")); - printf (" %s\n", _("RSS - resident set memory size")); - printf (" %s\n", _("CPU - percentage CPU")); + 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", "-m, --metric=TYPE"); + printf(" %s\n", _("Check thresholds against metric. Valid types:")); + printf(" %s\n", _("PROCS - number of processes (default)")); + printf(" %s\n", _("VSZ - virtual memory size")); + printf(" %s\n", _("RSS - resident set memory size")); + printf(" %s\n", _("CPU - percentage CPU")); /* only linux etime is support currently */ -#if defined( __linux__ ) - printf (" %s\n", _("ELAPSED - time elapsed in seconds")); +#if defined(__linux__) + printf(" %s\n", _("ELAPSED - time elapsed in seconds")); #endif /* defined(__linux__) */ - printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); - - printf (" %s\n", "-v, --verbose"); - printf (" %s\n", _("Extra information. Up to 3 verbosity levels")); - - printf (" %s\n", "-T, --traditional"); - printf (" %s\n", _("Filter own process the traditional way by PID instead of /proc/pid/exe")); - - 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,")); - printf (" %s\n", _("RSZDT, plus others based on the output of your 'ps' command).")); - printf (" %s\n", "-p, --ppid=PPID"); - printf (" %s\n", _("Only scan for children of the parent process ID indicated.")); - printf (" %s\n", "-z, --vsz=VSZ"); - printf (" %s\n", _("Only scan for processes with VSZ higher than indicated.")); - printf (" %s\n", "-r, --rss=RSS"); - printf (" %s\n", _("Only scan for processes with RSS higher than indicated.")); - printf (" %s\n", "-P, --pcpu=PCPU"); - printf (" %s\n", _("Only scan for processes with PCPU higher than indicated.")); - printf (" %s\n", "-u, --user=USER"); - printf (" %s\n", _("Only scan for processes with user name or ID indicated.")); - printf (" %s\n", "-a, --argument-array=STRING"); - printf (" %s\n", _("Only scan for processes with args that contain STRING.")); - printf (" %s\n", "--ereg-argument-array=STRING"); - printf (" %s\n", _("Only scan for processes with args that contain the regex STRING.")); - printf (" %s\n", "-C, --command=COMMAND"); - printf (" %s\n", _("Only scan for exact matches of COMMAND (without path).")); - printf (" %s\n", "-X, --exclude-process"); - printf (" %s\n", _("Exclude processes which match this comma separated list")); - printf (" %s\n", "-k, --no-kthreads"); - printf (" %s\n", _("Only scan for non kernel threads (works on Linux only).")); - - printf(_("\n\ + printf(UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + + printf(" %s\n", "-v, --verbose"); + printf(" %s\n", _("Extra information. Up to 3 verbosity levels")); + + printf(" %s\n", "-T, --traditional"); + printf(" %s\n", _("Filter own process the traditional way by PID instead of /proc/pid/exe")); + + 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,")); + printf(" %s\n", _("RSZDT, plus others based on the output of your 'ps' command).")); + printf(" %s\n", "-p, --ppid=PPID"); + printf(" %s\n", _("Only scan for children of the parent process ID indicated.")); + printf(" %s\n", "-z, --vsz=VSZ"); + printf(" %s\n", _("Only scan for processes with VSZ higher than indicated.")); + printf(" %s\n", "-r, --rss=RSS"); + printf(" %s\n", _("Only scan for processes with RSS higher than indicated.")); + printf(" %s\n", "-P, --pcpu=PCPU"); + printf(" %s\n", _("Only scan for processes with PCPU higher than indicated.")); + printf(" %s\n", "-u, --user=USER"); + printf(" %s\n", _("Only scan for processes with user name or ID indicated.")); + printf(" %s\n", "-a, --argument-array=STRING"); + printf(" %s\n", _("Only scan for processes with args that contain STRING.")); + printf(" %s\n", "--ereg-argument-array=STRING"); + printf(" %s\n", _("Only scan for processes with args that contain the regex STRING.")); + printf(" %s\n", "-C, --command=COMMAND"); + printf(" %s\n", _("Only scan for exact matches of COMMAND (without path).")); + printf(" %s\n", "-X, --exclude-process"); + printf(" %s\n", _("Exclude processes which match this comma separated list")); + printf(" %s\n", "-k, --no-kthreads"); + printf(" %s\n", _("Only scan for non kernel threads (works on Linux only).")); + + printf(_("\n\ RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n\ specified 'max:min', a warning status will be generated if the\n\ count is inside the specified range\n\n")); - printf(_("\ + printf(_("\ This plugin checks the number of currently running processes and\n\ generates WARNING or CRITICAL states if the process count is outside\n\ the specified threshold ranges. The process count can be filtered by\n\ process owner, parent process PID, current state (e.g., 'Z'), or may\n\ be the total number of running processes\n\n")); - 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\n", _("Critical if < 2 or > 1024 processes")); - printf (" %s\n", "check_procs -c 1: -C sshd"); - printf (" %s\n", _("Critical if not at least 1 process with command sshd")); - printf (" %s\n", "check_procs -w 1024 -c 1: -C sshd"); - printf (" %s\n", _("Warning if > 1024 processes with command name sshd.")); - printf (" %s\n\n", _("Critical if < 1 processes with command name sshd.")); - printf (" %s\n", "check_procs -w 10 -a '/usr/local/bin/perl' -u root"); - printf (" %s\n", _("Warning alert if > 10 processes with command arguments containing")); - printf (" %s\n\n", _("'/usr/local/bin/perl' and owned by root")); - 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", _("Alert if CPU of any processes over 10%% or 20%%")); - - printf (UT_SUPPORT); + 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\n", _("Critical if < 2 or > 1024 processes")); + printf(" %s\n", "check_procs -c 1: -C sshd"); + printf(" %s\n", _("Critical if not at least 1 process with command sshd")); + printf(" %s\n", "check_procs -w 1024 -c 1: -C sshd"); + printf(" %s\n", _("Warning if > 1024 processes with command name sshd.")); + printf(" %s\n\n", _("Critical if < 1 processes with command name sshd.")); + printf(" %s\n", "check_procs -w 10 -a '/usr/local/bin/perl' -u root"); + printf(" %s\n", _("Warning alert if > 10 processes with command arguments containing")); + printf(" %s\n\n", _("'/usr/local/bin/perl' and owned by root")); + 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", _("Alert if CPU of any processes over 10%% or 20%%")); + + printf(UT_SUPPORT); } -void -print_usage (void) -{ - printf ("%s\n", _("Usage:")); - printf ("%s -w -c [-m metric] [-s state] [-p ppid]\n", progname); - printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n"); - printf (" [-C command] [-X process_to_exclude] [-k] [-t timeout] [-v]\n"); +void print_usage(void) { + printf("%s\n", _("Usage:")); + printf("%s -w -c [-m metric] [-s state] [-p ppid]\n", progname); + printf(" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n"); + printf(" [-C command] [-X process_to_exclude] [-k] [-t timeout] [-v]\n"); } -- cgit v1.2.3-74-g34f1 From 16c3e2499309af654bcf92a4cc516521122e8d66 Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Wed, 12 Mar 2025 14:53:54 +0100 Subject: check_procs: general refactoring --- configure.ac | 2 +- plugins/check_procs.c | 247 +++++++++++++++++++++++--------------------------- 2 files changed, 114 insertions(+), 135 deletions(-) (limited to 'plugins/check_procs.c') diff --git a/configure.ac b/configure.ac index 204fc6e3..c66f9b2f 100644 --- a/configure.ac +++ b/configure.ac @@ -796,7 +796,7 @@ elif ps axwo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \ then ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]" ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu etime comm args'" - ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n" + ac_cv_ps_format="%s %u %d %d %d %d %f %s %s %n" ac_cv_ps_cols=10 AC_MSG_RESULT([$ac_cv_ps_command]) diff --git a/plugins/check_procs.c b/plugins/check_procs.c index 69b424dc..da2198a7 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c @@ -43,6 +43,7 @@ const char *email = "devel@monitoring-plugins.org"; #include "utils.h" #include "utils_cmd.h" #include "regex.h" +#include "states.h" #include #include @@ -91,7 +92,7 @@ enum metric { enum metric metric = METRIC_PROCS; static int verbose = 0; -static int uid; +static uid_t uid; static pid_t ppid; static int vsz; static int rss; @@ -107,62 +108,22 @@ static regex_t re_args; static char *fmt; static char *fails; static char tmp[MAX_INPUT_BUFFER]; -static int kthread_filter = 0; -static int usepid = 0; /* whether to test for pid or /proc/pid/exe */ +static bool kthread_filter = false; +static bool usepid = false; /* whether to test for pid or /proc/pid/exe */ static int stat_exe(const pid_t pid, struct stat *buf) { char *path; - int ret; xasprintf(&path, "/proc/%d/exe", pid); - ret = stat(path, buf); + int ret = stat(path, buf); free(path); return ret; } int main(int argc, char **argv) { - char *input_buffer; - char *input_line; - char *procprog; - - pid_t mypid = 0; - pid_t myppid = 0; - struct stat statbuf; - dev_t mydev = 0; - ino_t myino = 0; - int procuid = 0; - pid_t procpid = 0; - pid_t procppid = 0; - pid_t kthread_ppid = 0; - int procvsz = 0; - int procrss = 0; - int procseconds = 0; - float procpcpu = 0; - char procstat[8]; - char procetime[MAX_INPUT_BUFFER] = {'\0'}; - char *procargs; - - const char *zombie = "Z"; - - int resultsum = 0; /* bitmask of the filter criteria met by a process */ - int found = 0; /* counter for number of lines returned in `ps` output */ - int procs = 0; /* counter for number of processes meeting filter criteria */ - int pos; /* number of spaces before 'args' in `ps` output */ - int cols; /* number of columns in ps output */ - 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 result = STATE_UNKNOWN; - int ret = 0; - output chld_out, chld_err; - setlocale(LC_ALL, ""); + setlocale(LC_NUMERIC, "POSIX"); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - setlocale(LC_NUMERIC, "POSIX"); - - input_buffer = malloc(MAX_INPUT_BUFFER); - procprog = malloc(MAX_INPUT_BUFFER); xasprintf(&metric_name, "PROCS"); metric = METRIC_PROCS; @@ -175,13 +136,16 @@ int main(int argc, char **argv) { } /* find ourself */ - mypid = getpid(); - myppid = getppid(); + pid_t mypid = getpid(); + pid_t myppid = getppid(); + dev_t mydev = 0; + ino_t myino = 0; + struct stat statbuf; if (usepid || stat_exe(mypid, &statbuf) == -1) { /* usepid might have been set by -T */ - usepid = 1; + usepid = true; } else { - usepid = 0; + usepid = false; mydev = statbuf.st_dev; myino = statbuf.st_ino; } @@ -190,12 +154,15 @@ int main(int argc, char **argv) { if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) { die(STATE_UNKNOWN, _("Cannot catch SIGALRM")); } - (void)alarm((unsigned)timeout_interval); + (void)alarm(timeout_interval); if (verbose >= 2) { printf(_("CMD: %s\n"), PS_COMMAND); } + output chld_out; + output chld_err; + mp_state_enum result = STATE_UNKNOWN; if (input_filename == NULL) { result = cmd_run(PS_COMMAND, &chld_out, &chld_err, 0); if (chld_err.lines > 0) { @@ -206,20 +173,43 @@ int main(int argc, char **argv) { result = cmd_file_read(input_filename, &chld_out, 0); } + int pos; /* number of spaces before 'args' in `ps` output */ + uid_t procuid = 0; + pid_t procpid = 0; + pid_t procppid = 0; + pid_t kthread_ppid = 0; + int warn = 0; /* number of processes in warn state */ + int crit = 0; /* number of processes in crit state */ + int procvsz = 0; + int procrss = 0; + int procseconds = 0; + float procpcpu = 0; + char procstat[8]; + char procetime[MAX_INPUT_BUFFER] = {'\0'}; + int resultsum = 0; /* bitmask of the filter criteria met by a process */ + int found = 0; /* counter for number of lines returned in `ps` output */ + int procs = 0; /* counter for number of processes meeting filter criteria */ + char *input_buffer = malloc(MAX_INPUT_BUFFER); + char *procprog = malloc(MAX_INPUT_BUFFER); + const int expected_cols = PS_COLS - 1; + /* flush first line: j starts at 1 */ for (size_t j = 1; j < chld_out.lines; j++) { - input_line = chld_out.line[j]; + char *input_line = chld_out.line[j]; if (verbose >= 3) { printf("%s", input_line); } strcpy(procprog, ""); + char *procargs; xasprintf(&procargs, "%s", ""); - cols = sscanf(input_line, PS_FORMAT, PS_VARLIST); + /* number of columns in ps output */ + int cols = sscanf(input_line, PS_FORMAT, PS_VARLIST); /* Zombie processes do not give a procprog command */ + const char *zombie = "Z"; if (cols < expected_cols && strstr(procstat, zombie)) { cols = expected_cols; } @@ -240,6 +230,7 @@ int main(int argc, char **argv) { } /* Ignore self */ + int ret = 0; if ((usepid && mypid == procpid) || (((!usepid) && ((ret = stat_exe(procpid, &statbuf) != -1) && statbuf.st_dev == mydev && statbuf.st_ino == myino)) || (ret == -1 && errno == ENOENT))) { @@ -249,7 +240,7 @@ int main(int argc, char **argv) { continue; } /* Ignore parent*/ - else if (myppid == procpid) { + if (myppid == procpid) { if (verbose >= 3) { printf("not considering - is parent\n"); } @@ -266,15 +257,13 @@ int main(int argc, char **argv) { /* Ignore excluded processes by name */ if (options & EXCLUDE_PROGS) { - int found = 0; - int i = 0; - - for (i = 0; i < (exclude_progs_counter); i++) { + bool found = false; + for (int i = 0; i < (exclude_progs_counter); i++) { if (!strcmp(procprog, exclude_progs_arr[i])) { - found = 1; + found = true; } } - if (found == 0) { + if (!found) { resultsum |= EXCLUDE_PROGS; } else { if (verbose >= 3) { @@ -286,7 +275,7 @@ int main(int argc, char **argv) { /* filter kernel threads (children of KTHREAD_PARENT)*/ /* TODO adapt for other OSes than GNU/Linux sorry for not doing that, but I've no other OSes to test :-( */ - if (kthread_filter == 1) { + if (kthread_filter) { /* get pid KTHREAD_PARENT */ if (kthread_ppid == 0 && !strcmp(procprog, KTHREAD_PARENT)) { kthread_ppid = procpid; @@ -341,28 +330,29 @@ int main(int argc, char **argv) { procrss, procpid, procppid, procpcpu, procstat, procetime, procprog, procargs); } + mp_state_enum temporary_result = STATE_OK; if (metric == METRIC_VSZ) { - i = get_status((double)procvsz, procs_thresholds); + temporary_result = get_status((double)procvsz, procs_thresholds); } else if (metric == METRIC_RSS) { - i = get_status((double)procrss, procs_thresholds); + temporary_result = get_status((double)procrss, procs_thresholds); } /* TODO? float thresholds for --metric=CPU */ else if (metric == METRIC_CPU) { - i = get_status(procpcpu, procs_thresholds); + temporary_result = get_status(procpcpu, procs_thresholds); } else if (metric == METRIC_ELAPSED) { - i = get_status((double)procseconds, procs_thresholds); + temporary_result = get_status((double)procseconds, procs_thresholds); } if (metric != METRIC_PROCS) { - if (i == STATE_WARNING) { + if (temporary_result == STATE_WARNING) { warn++; xasprintf(&fails, "%s%s%s", fails, (strcmp(fails, "") ? ", " : ""), procprog); - result = max_state(result, i); + result = max_state(result, temporary_result); } - if (i == STATE_CRITICAL) { + if (temporary_result == STATE_CRITICAL) { crit++; xasprintf(&fails, "%s%s%s", fails, (strcmp(fails, "") ? ", " : ""), procprog); - result = max_state(result, i); + result = max_state(result, temporary_result); } } } @@ -416,20 +406,11 @@ int main(int argc, char **argv) { } printf("\n"); - return result; + exit(result); } /* process command-line arguments */ int process_arguments(int argc, char **argv) { - int c = 1; - char *user; - struct passwd *pw; - int option = 0; - int err; - int cflags = REG_NOSUB | REG_EXTENDED; - char errbuf[MAX_INPUT_BUFFER]; - char *temp_string; - int i = 0; static struct option longopts[] = {{"warning", required_argument, 0, 'w'}, {"critical", required_argument, 0, 'c'}, {"metric", required_argument, 0, 'm'}, @@ -453,20 +434,21 @@ int process_arguments(int argc, char **argv) { {"exclude-process", required_argument, 0, 'X'}, {0, 0, 0, 0}}; - for (c = 1; c < argc; c++) { - if (strcmp("-to", argv[c]) == 0) { - strcpy(argv[c], "-t"); + for (int index = 1; index < argc; index++) { + if (strcmp("-to", argv[index]) == 0) { + strcpy(argv[index], "-t"); } } - while (1) { - c = getopt_long(argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T:X:", longopts, &option); + while (true) { + int option = 0; + int option_index = getopt_long(argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T:X:", longopts, &option); - if (c == -1 || c == EOF) { + if (option_index == -1 || option_index == EOF) { break; } - switch (c) { + switch (option_index) { case '?': /* help */ usage5(); case 'h': /* help */ @@ -504,10 +486,11 @@ int process_arguments(int argc, char **argv) { xasprintf(&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts); options |= STAT; break; - case 'u': /* user or user id */ + case 'u': /* user or user id */ { + struct passwd *pw; if (is_integer(optarg)) { uid = atoi(optarg); - pw = getpwuid((uid_t)uid); + pw = getpwuid(uid); /* check to be sure user exists */ if (pw == NULL) { usage2(_("UID was not found"), optarg); @@ -521,10 +504,11 @@ int process_arguments(int argc, char **argv) { /* then get uid */ uid = pw->pw_uid; } - user = pw->pw_name; + + char *user = pw->pw_name; xasprintf(&fmt, "%s%sUID = %d (%s)", (fmt ? fmt : ""), (options ? ", " : ""), uid, user); options |= USER; - break; + } break; case 'C': /* command */ /* TODO: allow this to be passed in with --metric */ if (prog) { @@ -542,12 +526,12 @@ int process_arguments(int argc, char **argv) { exclude_progs = optarg; } xasprintf(&fmt, _("%s%sexclude progs '%s'"), (fmt ? fmt : ""), (options ? ", " : ""), exclude_progs); - char *p = strtok(exclude_progs, ","); + char *tmp_pointer = strtok(exclude_progs, ","); - while (p) { + while (tmp_pointer) { exclude_progs_arr = realloc(exclude_progs_arr, sizeof(char *) * ++exclude_progs_counter); - exclude_progs_arr[exclude_progs_counter - 1] = p; - p = strtok(NULL, ","); + exclude_progs_arr[exclude_progs_counter - 1] = tmp_pointer; + tmp_pointer = strtok(NULL, ","); } options |= EXCLUDE_PROGS; @@ -562,23 +546,26 @@ int process_arguments(int argc, char **argv) { xasprintf(&fmt, "%s%sargs '%s'", (fmt ? fmt : ""), (options ? ", " : ""), args); options |= ARGS; break; - case CHAR_MAX + 1: - err = regcomp(&re_args, optarg, cflags); + case CHAR_MAX + 1: { + int cflags = REG_NOSUB | REG_EXTENDED; + int err = regcomp(&re_args, optarg, cflags); if (err != 0) { + char errbuf[MAX_INPUT_BUFFER]; regerror(err, &re_args, errbuf, MAX_INPUT_BUFFER); die(STATE_UNKNOWN, "PROCS %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf); } /* Strip off any | within the regex optarg */ - temp_string = strdup(optarg); - while (temp_string[i] != '\0') { - if (temp_string[i] == '|') { - temp_string[i] = ','; + char *temp_string = strdup(optarg); + int index = 0; + while (temp_string[index] != '\0') { + if (temp_string[index] == '|') { + temp_string[index] = ','; } - i++; + index++; } xasprintf(&fmt, "%s%sregex args '%s'", (fmt ? fmt : ""), (options ? ", " : ""), temp_string); options |= EREG_ARGS; - break; + } break; case 'r': /* RSS */ if (sscanf(optarg, "%d%[^0-9]", &rss, tmp) == 1) { xasprintf(&fmt, "%s%sRSS >= %d", (fmt ? fmt : ""), (options ? ", " : ""), rss); @@ -606,29 +593,33 @@ int process_arguments(int argc, char **argv) { if (strcmp(optarg, "PROCS") == 0) { metric = METRIC_PROCS; break; - } else if (strcmp(optarg, "VSZ") == 0) { + } + if (strcmp(optarg, "VSZ") == 0) { metric = METRIC_VSZ; break; - } else if (strcmp(optarg, "RSS") == 0) { + } + if (strcmp(optarg, "RSS") == 0) { metric = METRIC_RSS; break; - } else if (strcmp(optarg, "CPU") == 0) { + } + if (strcmp(optarg, "CPU") == 0) { metric = METRIC_CPU; break; - } else if (strcmp(optarg, "ELAPSED") == 0) { + } + if (strcmp(optarg, "ELAPSED") == 0) { metric = METRIC_ELAPSED; break; } usage4(_("Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!")); case 'k': /* linux kernel thread filter */ - kthread_filter = 1; + kthread_filter = true; break; case 'v': /* command */ verbose++; break; case 'T': - usepid = 1; + usepid = true; break; case CHAR_MAX + 2: input_filename = optarg; @@ -636,15 +627,15 @@ int process_arguments(int argc, char **argv) { } } - c = optind; - if ((!warning_range) && argv[c]) { - warning_range = argv[c++]; + int index = optind; + if ((!warning_range) && argv[index]) { + warning_range = argv[index++]; } - if ((!critical_range) && argv[c]) { - critical_range = argv[c++]; + if ((!critical_range) && argv[index]) { + critical_range = argv[index++]; } - if (statopts == NULL && argv[c]) { - xasprintf(&statopts, "%s", argv[c++]); + if (statopts == NULL && argv[index]) { + xasprintf(&statopts, "%s", argv[index++]); xasprintf(&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts); options |= STAT; } @@ -685,25 +676,9 @@ int validate_arguments() { /* convert the elapsed time to seconds */ int convert_to_seconds(char *etime) { - - char *ptr; - int total; - - int hyphcnt; - int coloncnt; - int days; - int hours; - int minutes; - int seconds; - - hyphcnt = 0; - coloncnt = 0; - days = 0; - hours = 0; - minutes = 0; - seconds = 0; - - for (ptr = etime; *ptr != '\0'; ptr++) { + int hyphcnt = 0; + int coloncnt = 0; + for (char *ptr = etime; *ptr != '\0'; ptr++) { if (*ptr == '-') { hyphcnt++; @@ -715,6 +690,10 @@ int convert_to_seconds(char *etime) { } } + int days = 0; + int hours = 0; + int minutes = 0; + int seconds = 0; if (hyphcnt > 0) { sscanf(etime, "%d-%d:%d:%d", &days, &hours, &minutes, &seconds); /* linux 2.6.5/2.6.6 reporting some processes with infinite @@ -730,7 +709,7 @@ int convert_to_seconds(char *etime) { } } - total = (days * 86400) + (hours * 3600) + (minutes * 60) + seconds; + int total = (days * 86400) + (hours * 3600) + (minutes * 60) + seconds; if (verbose >= 3 && metric == METRIC_ELAPSED) { printf("seconds: %d\n", total); -- cgit v1.2.3-74-g34f1 From a14b2b35776c7550123ce58af571913eb9d7819f Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Wed, 12 Mar 2025 15:29:36 +0100 Subject: Refactor check_procs --- plugins/Makefile.am | 1 + plugins/check_procs.c | 335 ++++++++++++++++++++--------------------- plugins/check_procs.d/config.h | 75 +++++++++ 3 files changed, 243 insertions(+), 168 deletions(-) create mode 100644 plugins/check_procs.d/config.h (limited to 'plugins/check_procs.c') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 6c582a15..0920adce 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -63,6 +63,7 @@ EXTRA_DIST = t \ check_mrtg.d \ check_apt.d \ check_pgsql.d \ + check_procs.d \ check_by_ssh.d \ check_smtp.d \ check_mysql.d \ diff --git a/plugins/check_procs.c b/plugins/check_procs.c index da2198a7..83e6864e 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c @@ -44,6 +44,7 @@ const char *email = "devel@monitoring-plugins.org"; #include "utils_cmd.h" #include "regex.h" #include "states.h" +#include "check_procs.d/config.h" #include #include @@ -52,17 +53,17 @@ const char *email = "devel@monitoring-plugins.org"; # include #endif -static int process_arguments(int /*argc*/, char ** /*argv*/); -static int validate_arguments(void); -static int convert_to_seconds(char * /*etime*/); +typedef struct { + int errorcode; + check_procs_config config; +} check_procs_config_wrapper; +static check_procs_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/); +static check_procs_config_wrapper validate_arguments(check_procs_config_wrapper /*config_wrapper*/); + +static int convert_to_seconds(char * /*etime*/, enum metric /*metric*/); static void print_help(void); void print_usage(void); -static char *warning_range = NULL; -static char *critical_range = NULL; -static thresholds *procs_thresholds = NULL; - -static int options = 0; /* bitmask of filter criteria to test against */ #define ALL 1 #define STAT 2 #define PPID 4 @@ -80,36 +81,7 @@ static int options = 0; /* bitmask of filter criteria to test against */ "kthreadd" /* the parent process of kernel threads: \ ppid of procs are compared to pid of this proc*/ -/* Different metrics */ -char *metric_name; -enum metric { - METRIC_PROCS, - METRIC_VSZ, - METRIC_RSS, - METRIC_CPU, - METRIC_ELAPSED -}; -enum metric metric = METRIC_PROCS; - static int verbose = 0; -static uid_t uid; -static pid_t ppid; -static int vsz; -static int rss; -static float pcpu; -static char *statopts; -static char *prog; -static char *exclude_progs; -static char **exclude_progs_arr = NULL; -static char exclude_progs_counter = 0; -static char *args; -static char *input_filename = NULL; -static regex_t re_args; -static char *fmt; -static char *fails; -static char tmp[MAX_INPUT_BUFFER]; -static bool kthread_filter = false; -static bool usepid = false; /* whether to test for pid or /proc/pid/exe */ static int stat_exe(const pid_t pid, struct stat *buf) { char *path; @@ -125,27 +97,27 @@ int main(int argc, char **argv) { bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - xasprintf(&metric_name, "PROCS"); - metric = METRIC_PROCS; - /* Parse extra opts if any */ argv = np_extra_opts(&argc, argv, progname); - if (process_arguments(argc, argv) == ERROR) { + check_procs_config_wrapper tmp_config = process_arguments(argc, argv); + if (tmp_config.errorcode == ERROR) { usage4(_("Could not parse arguments")); } + check_procs_config config = tmp_config.config; + /* find ourself */ pid_t mypid = getpid(); pid_t myppid = getppid(); dev_t mydev = 0; ino_t myino = 0; struct stat statbuf; - if (usepid || stat_exe(mypid, &statbuf) == -1) { + if (config.usepid || stat_exe(mypid, &statbuf) == -1) { /* usepid might have been set by -T */ - usepid = true; + config.usepid = true; } else { - usepid = false; + config.usepid = false; mydev = statbuf.st_dev; myino = statbuf.st_ino; } @@ -163,14 +135,14 @@ int main(int argc, char **argv) { output chld_out; output chld_err; mp_state_enum result = STATE_UNKNOWN; - if (input_filename == NULL) { + if (config.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); + result = cmd_file_read(config.input_filename, &chld_out, 0); } int pos; /* number of spaces before 'args' in `ps` output */ @@ -222,7 +194,7 @@ int main(int argc, char **argv) { strcpy(procprog, base_name(procprog)); /* we need to convert the elapsed time to seconds */ - procseconds = convert_to_seconds(procetime); + procseconds = convert_to_seconds(procetime, config.metric); if (verbose >= 3) { printf("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", procs, procuid, procvsz, @@ -231,8 +203,8 @@ int main(int argc, char **argv) { /* Ignore self */ int ret = 0; - if ((usepid && mypid == procpid) || - (((!usepid) && ((ret = stat_exe(procpid, &statbuf) != -1) && statbuf.st_dev == mydev && statbuf.st_ino == myino)) || + if ((config.usepid && mypid == procpid) || + (((!config.usepid) && ((ret = stat_exe(procpid, &statbuf) != -1) && statbuf.st_dev == mydev && statbuf.st_ino == myino)) || (ret == -1 && errno == ENOENT))) { if (verbose >= 3) { printf("not considering - is myself or gone\n"); @@ -256,10 +228,10 @@ int main(int argc, char **argv) { } /* Ignore excluded processes by name */ - if (options & EXCLUDE_PROGS) { + if (config.options & EXCLUDE_PROGS) { bool found = false; - for (int i = 0; i < (exclude_progs_counter); i++) { - if (!strcmp(procprog, exclude_progs_arr[i])) { + for (int i = 0; i < (config.exclude_progs_counter); i++) { + if (!strcmp(procprog, config.exclude_progs_arr[i])) { found = true; } } @@ -275,7 +247,7 @@ int main(int argc, char **argv) { /* filter kernel threads (children of KTHREAD_PARENT)*/ /* TODO adapt for other OSes than GNU/Linux sorry for not doing that, but I've no other OSes to test :-( */ - if (kthread_filter) { + if (config.kthread_filter) { /* get pid KTHREAD_PARENT */ if (kthread_ppid == 0 && !strcmp(procprog, KTHREAD_PARENT)) { kthread_ppid = procpid; @@ -289,38 +261,38 @@ int main(int argc, char **argv) { } } - if ((options & STAT) && (strstr(procstat, statopts))) { + if ((config.options & STAT) && (strstr(procstat, config.statopts))) { resultsum |= STAT; } - if ((options & ARGS) && procargs && (strstr(procargs, args) != NULL)) { + if ((config.options & ARGS) && procargs && (strstr(procargs, config.args) != NULL)) { resultsum |= ARGS; } - if ((options & EREG_ARGS) && procargs && (regexec(&re_args, procargs, (size_t)0, NULL, 0) == 0)) { + if ((config.options & EREG_ARGS) && procargs && (regexec(&config.re_args, procargs, (size_t)0, NULL, 0) == 0)) { resultsum |= EREG_ARGS; } - if ((options & PROG) && procprog && (strcmp(prog, procprog) == 0)) { + if ((config.options & PROG) && procprog && (strcmp(config.prog, procprog) == 0)) { resultsum |= PROG; } - if ((options & PPID) && (procppid == ppid)) { + if ((config.options & PPID) && (procppid == config.ppid)) { resultsum |= PPID; } - if ((options & USER) && (procuid == uid)) { + if ((config.options & USER) && (procuid == config.uid)) { resultsum |= USER; } - if ((options & VSZ) && (procvsz >= vsz)) { + if ((config.options & VSZ) && (procvsz >= config.vsz)) { resultsum |= VSZ; } - if ((options & RSS) && (procrss >= rss)) { + if ((config.options & RSS) && (procrss >= config.rss)) { resultsum |= RSS; } - if ((options & PCPU) && (procpcpu >= pcpu)) { + if ((config.options & PCPU) && (procpcpu >= config.pcpu)) { resultsum |= PCPU; } found++; /* Next line if filters not matched */ - if (!(options == resultsum || options == ALL)) { + if (!(config.options == resultsum || config.options == ALL)) { continue; } @@ -331,27 +303,27 @@ int main(int argc, char **argv) { } mp_state_enum temporary_result = STATE_OK; - if (metric == METRIC_VSZ) { - temporary_result = get_status((double)procvsz, procs_thresholds); - } else if (metric == METRIC_RSS) { - temporary_result = get_status((double)procrss, procs_thresholds); + if (config.metric == METRIC_VSZ) { + temporary_result = get_status((double)procvsz, config.procs_thresholds); + } else if (config.metric == METRIC_RSS) { + temporary_result = get_status((double)procrss, config.procs_thresholds); } /* TODO? float thresholds for --metric=CPU */ - else if (metric == METRIC_CPU) { - temporary_result = get_status(procpcpu, procs_thresholds); - } else if (metric == METRIC_ELAPSED) { - temporary_result = get_status((double)procseconds, procs_thresholds); + else if (config.metric == METRIC_CPU) { + temporary_result = get_status(procpcpu, config.procs_thresholds); + } else if (config.metric == METRIC_ELAPSED) { + temporary_result = get_status((double)procseconds, config.procs_thresholds); } - if (metric != METRIC_PROCS) { + if (config.metric != METRIC_PROCS) { if (temporary_result == STATE_WARNING) { warn++; - xasprintf(&fails, "%s%s%s", fails, (strcmp(fails, "") ? ", " : ""), procprog); + xasprintf(&config.fails, "%s%s%s", config.fails, (strcmp(config.fails, "") ? ", " : ""), procprog); result = max_state(result, temporary_result); } if (temporary_result == STATE_CRITICAL) { crit++; - xasprintf(&fails, "%s%s%s", fails, (strcmp(fails, "") ? ", " : ""), procprog); + xasprintf(&config.fails, "%s%s%s", config.fails, (strcmp(config.fails, "") ? ", " : ""), procprog); result = max_state(result, temporary_result); } } @@ -372,35 +344,36 @@ int main(int argc, char **argv) { } /* Needed if procs found, but none match filter */ - if (metric == METRIC_PROCS) { - result = max_state(result, get_status((double)procs, procs_thresholds)); + if (config.metric == METRIC_PROCS) { + result = max_state(result, get_status((double)procs, config.procs_thresholds)); } if (result == STATE_OK) { - printf("%s %s: ", metric_name, _("OK")); + printf("%s %s: ", config.metric_name, _("OK")); } else if (result == STATE_WARNING) { - printf("%s %s: ", metric_name, _("WARNING")); - if (metric != METRIC_PROCS) { + printf("%s %s: ", config.metric_name, _("WARNING")); + if (config.metric != METRIC_PROCS) { printf(_("%d warn out of "), warn); } } else if (result == STATE_CRITICAL) { - printf("%s %s: ", metric_name, _("CRITICAL")); - if (metric != METRIC_PROCS) { + printf("%s %s: ", config.metric_name, _("CRITICAL")); + if (config.metric != METRIC_PROCS) { printf(_("%d crit, %d warn out of "), crit, warn); } } printf(ngettext("%d process", "%d processes", (unsigned long)procs), procs); - if (strcmp(fmt, "") != 0) { - printf(_(" with %s"), fmt); + if (strcmp(config.fmt, "") != 0) { + printf(_(" with %s"), config.fmt); } - if (verbose >= 1 && strcmp(fails, "")) { - printf(" [%s]", fails); + if (verbose >= 1 && strcmp(config.fails, "")) { + printf(" [%s]", config.fails); } - if (metric == METRIC_PROCS) { - printf(" | procs=%d;%s;%s;0;", procs, warning_range ? warning_range : "", critical_range ? critical_range : ""); + if (config.metric == METRIC_PROCS) { + printf(" | procs=%d;%s;%s;0;", procs, config.warning_range ? config.warning_range : "", + config.critical_range ? config.critical_range : ""); } else { printf(" | procs=%d;;;0; procs_warn=%d;;;0; procs_crit=%d;;;0;", procs, warn, crit); } @@ -410,7 +383,7 @@ int main(int argc, char **argv) { } /* process command-line arguments */ -int process_arguments(int argc, char **argv) { +check_procs_config_wrapper process_arguments(int argc, char **argv) { static struct option longopts[] = {{"warning", required_argument, 0, 'w'}, {"critical", required_argument, 0, 'c'}, {"metric", required_argument, 0, 'm'}, @@ -440,6 +413,11 @@ int process_arguments(int argc, char **argv) { } } + check_procs_config_wrapper result = { + .errorcode = OK, + .config = check_procs_config_init(), + }; + while (true) { int option = 0; int option_index = getopt_long(argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T:X:", longopts, &option); @@ -465,32 +443,36 @@ int process_arguments(int argc, char **argv) { } break; case 'c': /* critical threshold */ - critical_range = optarg; + result.config.critical_range = optarg; break; case 'w': /* warning threshold */ - warning_range = optarg; + result.config.warning_range = optarg; break; - case 'p': /* process id */ - if (sscanf(optarg, "%d%[^0-9]", &ppid, tmp) == 1) { - xasprintf(&fmt, "%s%sPPID = %d", (fmt ? fmt : ""), (options ? ", " : ""), ppid); - options |= PPID; + case 'p': { /* process id */ + static char tmp[MAX_INPUT_BUFFER]; + if (sscanf(optarg, "%d%[^0-9]", &result.config.ppid, tmp) == 1) { + xasprintf(&result.config.fmt, "%s%sPPID = %d", (result.config.fmt ? result.config.fmt : ""), + (result.config.options ? ", " : ""), result.config.ppid); + result.config.options |= PPID; break; } usage4(_("Parent Process ID must be an integer!")); + } case 's': /* status */ - if (statopts) { + if (result.config.statopts) { break; } else { - statopts = optarg; + result.config.statopts = optarg; } - xasprintf(&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts); - options |= STAT; + xasprintf(&result.config.fmt, _("%s%sSTATE = %s"), (result.config.fmt ? result.config.fmt : ""), + (result.config.options ? ", " : ""), result.config.statopts); + result.config.options |= STAT; break; case 'u': /* user or user id */ { struct passwd *pw; if (is_integer(optarg)) { - uid = atoi(optarg); - pw = getpwuid(uid); + result.config.uid = atoi(optarg); + pw = getpwuid(result.config.uid); /* check to be sure user exists */ if (pw == NULL) { usage2(_("UID was not found"), optarg); @@ -502,56 +484,61 @@ int process_arguments(int argc, char **argv) { usage2(_("User name was not found"), optarg); } /* then get uid */ - uid = pw->pw_uid; + result.config.uid = pw->pw_uid; } char *user = pw->pw_name; - xasprintf(&fmt, "%s%sUID = %d (%s)", (fmt ? fmt : ""), (options ? ", " : ""), uid, user); - options |= USER; + xasprintf(&result.config.fmt, "%s%sUID = %d (%s)", (result.config.fmt ? result.config.fmt : ""), + (result.config.options ? ", " : ""), result.config.uid, user); + result.config.options |= USER; } break; case 'C': /* command */ /* TODO: allow this to be passed in with --metric */ - if (prog) { + if (result.config.prog) { break; } else { - prog = optarg; + result.config.prog = optarg; } - xasprintf(&fmt, _("%s%scommand name '%s'"), (fmt ? fmt : ""), (options ? ", " : ""), prog); - options |= PROG; + xasprintf(&result.config.fmt, _("%s%scommand name '%s'"), (result.config.fmt ? result.config.fmt : ""), + (result.config.options ? ", " : ""), result.config.prog); + result.config.options |= PROG; break; case 'X': - if (exclude_progs) { + if (result.config.exclude_progs) { break; } else { - exclude_progs = optarg; + result.config.exclude_progs = optarg; } - xasprintf(&fmt, _("%s%sexclude progs '%s'"), (fmt ? fmt : ""), (options ? ", " : ""), exclude_progs); - char *tmp_pointer = strtok(exclude_progs, ","); + xasprintf(&result.config.fmt, _("%s%sexclude progs '%s'"), (result.config.fmt ? result.config.fmt : ""), + (result.config.options ? ", " : ""), result.config.exclude_progs); + char *tmp_pointer = strtok(result.config.exclude_progs, ","); while (tmp_pointer) { - exclude_progs_arr = realloc(exclude_progs_arr, sizeof(char *) * ++exclude_progs_counter); - exclude_progs_arr[exclude_progs_counter - 1] = tmp_pointer; + result.config.exclude_progs_arr = + realloc(result.config.exclude_progs_arr, sizeof(char *) * ++result.config.exclude_progs_counter); + result.config.exclude_progs_arr[result.config.exclude_progs_counter - 1] = tmp_pointer; tmp_pointer = strtok(NULL, ","); } - options |= EXCLUDE_PROGS; + result.config.options |= EXCLUDE_PROGS; break; case 'a': /* args (full path name with args) */ /* TODO: allow this to be passed in with --metric */ - if (args) { + if (result.config.args) { break; } else { - args = optarg; + result.config.args = optarg; } - xasprintf(&fmt, "%s%sargs '%s'", (fmt ? fmt : ""), (options ? ", " : ""), args); - options |= ARGS; + xasprintf(&result.config.fmt, "%s%sargs '%s'", (result.config.fmt ? result.config.fmt : ""), + (result.config.options ? ", " : ""), result.config.args); + result.config.options |= ARGS; break; case CHAR_MAX + 1: { int cflags = REG_NOSUB | REG_EXTENDED; - int err = regcomp(&re_args, optarg, cflags); + int err = regcomp(&result.config.re_args, optarg, cflags); if (err != 0) { char errbuf[MAX_INPUT_BUFFER]; - regerror(err, &re_args, errbuf, MAX_INPUT_BUFFER); + regerror(err, &result.config.re_args, errbuf, MAX_INPUT_BUFFER); die(STATE_UNKNOWN, "PROCS %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf); } /* Strip off any | within the regex optarg */ @@ -563,119 +550,131 @@ int process_arguments(int argc, char **argv) { } index++; } - xasprintf(&fmt, "%s%sregex args '%s'", (fmt ? fmt : ""), (options ? ", " : ""), temp_string); - options |= EREG_ARGS; + xasprintf(&result.config.fmt, "%s%sregex args '%s'", (result.config.fmt ? result.config.fmt : ""), + (result.config.options ? ", " : ""), temp_string); + result.config.options |= EREG_ARGS; } break; - case 'r': /* RSS */ - if (sscanf(optarg, "%d%[^0-9]", &rss, tmp) == 1) { - xasprintf(&fmt, "%s%sRSS >= %d", (fmt ? fmt : ""), (options ? ", " : ""), rss); - options |= RSS; + case 'r': { /* RSS */ + static char tmp[MAX_INPUT_BUFFER]; + if (sscanf(optarg, "%d%[^0-9]", &result.config.rss, tmp) == 1) { + xasprintf(&result.config.fmt, "%s%sRSS >= %d", (result.config.fmt ? result.config.fmt : ""), + (result.config.options ? ", " : ""), result.config.rss); + result.config.options |= RSS; break; } usage4(_("RSS must be an integer!")); - case 'z': /* VSZ */ - if (sscanf(optarg, "%d%[^0-9]", &vsz, tmp) == 1) { - xasprintf(&fmt, "%s%sVSZ >= %d", (fmt ? fmt : ""), (options ? ", " : ""), vsz); - options |= VSZ; + } + case 'z': { /* VSZ */ + static char tmp[MAX_INPUT_BUFFER]; + if (sscanf(optarg, "%d%[^0-9]", &result.config.vsz, tmp) == 1) { + xasprintf(&result.config.fmt, "%s%sVSZ >= %d", (result.config.fmt ? result.config.fmt : ""), + (result.config.options ? ", " : ""), result.config.vsz); + result.config.options |= VSZ; break; } usage4(_("VSZ must be an integer!")); - case 'P': /* PCPU */ + } + case 'P': { /* PCPU */ /* TODO: -P 1.5.5 is accepted */ - if (sscanf(optarg, "%f%[^0-9.]", &pcpu, tmp) == 1) { - xasprintf(&fmt, "%s%sPCPU >= %.2f", (fmt ? fmt : ""), (options ? ", " : ""), pcpu); - options |= PCPU; + static char tmp[MAX_INPUT_BUFFER]; + if (sscanf(optarg, "%f%[^0-9.]", &result.config.pcpu, tmp) == 1) { + xasprintf(&result.config.fmt, "%s%sPCPU >= %.2f", (result.config.fmt ? result.config.fmt : ""), + (result.config.options ? ", " : ""), result.config.pcpu); + result.config.options |= PCPU; break; } usage4(_("PCPU must be a float!")); + } case 'm': - xasprintf(&metric_name, "%s", optarg); + xasprintf(&result.config.metric_name, "%s", optarg); if (strcmp(optarg, "PROCS") == 0) { - metric = METRIC_PROCS; + result.config.metric = METRIC_PROCS; break; } if (strcmp(optarg, "VSZ") == 0) { - metric = METRIC_VSZ; + result.config.metric = METRIC_VSZ; break; } if (strcmp(optarg, "RSS") == 0) { - metric = METRIC_RSS; + result.config.metric = METRIC_RSS; break; } if (strcmp(optarg, "CPU") == 0) { - metric = METRIC_CPU; + result.config.metric = METRIC_CPU; break; } if (strcmp(optarg, "ELAPSED") == 0) { - metric = METRIC_ELAPSED; + result.config.metric = METRIC_ELAPSED; break; } usage4(_("Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!")); case 'k': /* linux kernel thread filter */ - kthread_filter = true; + result.config.kthread_filter = true; break; case 'v': /* command */ verbose++; break; case 'T': - usepid = true; + result.config.usepid = true; break; case CHAR_MAX + 2: - input_filename = optarg; + result.config.input_filename = optarg; break; } } int index = optind; - if ((!warning_range) && argv[index]) { - warning_range = argv[index++]; + if ((!result.config.warning_range) && argv[index]) { + result.config.warning_range = argv[index++]; } - if ((!critical_range) && argv[index]) { - critical_range = argv[index++]; + if ((!result.config.critical_range) && argv[index]) { + result.config.critical_range = argv[index++]; } - if (statopts == NULL && argv[index]) { - xasprintf(&statopts, "%s", argv[index++]); - xasprintf(&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts); - options |= STAT; + if (result.config.statopts == NULL && argv[index]) { + xasprintf(&result.config.statopts, "%s", argv[index++]); + xasprintf(&result.config.fmt, _("%s%sSTATE = %s"), (result.config.fmt ? result.config.fmt : ""), + (result.config.options ? ", " : ""), result.config.statopts); + result.config.options |= STAT; } /* this will abort in case of invalid ranges */ - set_thresholds(&procs_thresholds, warning_range, critical_range); + set_thresholds(&result.config.procs_thresholds, result.config.warning_range, result.config.critical_range); - return validate_arguments(); + return validate_arguments(result); } -int validate_arguments() { - if (options == 0) { - options = ALL; +check_procs_config_wrapper validate_arguments(check_procs_config_wrapper config_wrapper) { + if (config_wrapper.config.options == 0) { + config_wrapper.config.options = ALL; } - if (statopts == NULL) { - statopts = strdup(""); + if (config_wrapper.config.statopts == NULL) { + config_wrapper.config.statopts = strdup(""); } - if (prog == NULL) { - prog = strdup(""); + if (config_wrapper.config.prog == NULL) { + config_wrapper.config.prog = strdup(""); } - if (args == NULL) { - args = strdup(""); + if (config_wrapper.config.args == NULL) { + config_wrapper.config.args = strdup(""); } - if (fmt == NULL) { - fmt = strdup(""); + if (config_wrapper.config.fmt == NULL) { + config_wrapper.config.fmt = strdup(""); } - if (fails == NULL) { - fails = strdup(""); + if (config_wrapper.config.fails == NULL) { + config_wrapper.config.fails = strdup(""); } - return options; + // return options; + return config_wrapper; } /* convert the elapsed time to seconds */ -int convert_to_seconds(char *etime) { +int convert_to_seconds(char *etime, enum metric metric) { int hyphcnt = 0; int coloncnt = 0; for (char *ptr = etime; *ptr != '\0'; ptr++) { diff --git a/plugins/check_procs.d/config.h b/plugins/check_procs.d/config.h new file mode 100644 index 00000000..815809d4 --- /dev/null +++ b/plugins/check_procs.d/config.h @@ -0,0 +1,75 @@ +#pragma once + +#include "../../config.h" +#include "regex.h" +#include "thresholds.h" +#include +#include +#include + +enum metric { + METRIC_PROCS, + METRIC_VSZ, + METRIC_RSS, + METRIC_CPU, + METRIC_ELAPSED +}; + +typedef struct { + int options; /* bitmask of filter criteria to test against */ + enum metric metric; + char *metric_name; + char *input_filename; + char *prog; + char *args; + char *fmt; + char *fails; + char *exclude_progs; + char **exclude_progs_arr; + char exclude_progs_counter; + regex_t re_args; + + bool kthread_filter; + bool usepid; /* whether to test for pid or /proc/pid/exe */ + uid_t uid; + pid_t ppid; + int vsz; + int rss; + float pcpu; + char *statopts; + + char *warning_range; + char *critical_range; + thresholds *procs_thresholds; +} check_procs_config; + +check_procs_config check_procs_config_init() { + check_procs_config tmp = { + .options = 0, + .metric = METRIC_PROCS, + .metric_name = strdup("PROCS"), + .input_filename = NULL, + .prog = NULL, + .args = NULL, + .fmt = NULL, + .fails = NULL, + .exclude_progs = NULL, + .exclude_progs_arr = NULL, + .exclude_progs_counter = 0, + .re_args = {}, + + .kthread_filter = false, + .usepid = false, + .uid = {}, + .ppid = {}, + .vsz = 0, + .rss = 0, + .pcpu = 0, + .statopts = NULL, + + .warning_range = NULL, + .critical_range = NULL, + .procs_thresholds = NULL, + }; + return tmp; +} -- cgit v1.2.3-74-g34f1