diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/check_curl.c | 3 | ||||
-rw-r--r-- | plugins/check_procs.c | 47 | ||||
-rw-r--r-- | plugins/check_swap.c | 3 | ||||
-rwxr-xr-x | plugins/tests/check_procs.t | 8 |
4 files changed, 53 insertions, 8 deletions
diff --git a/plugins/check_curl.c b/plugins/check_curl.c index e5be1ad5..c51914a9 100644 --- a/plugins/check_curl.c +++ b/plugins/check_curl.c | |||
@@ -55,6 +55,7 @@ const char *email = "devel@monitoring-plugins.org"; | |||
55 | #include "uriparser/Uri.h" | 55 | #include "uriparser/Uri.h" |
56 | 56 | ||
57 | #include <arpa/inet.h> | 57 | #include <arpa/inet.h> |
58 | #include <netinet/in.h> | ||
58 | 59 | ||
59 | #if defined(HAVE_SSL) && defined(USE_OPENSSL) | 60 | #if defined(HAVE_SSL) && defined(USE_OPENSSL) |
60 | #include <openssl/opensslv.h> | 61 | #include <openssl/opensslv.h> |
@@ -541,7 +542,7 @@ check_http (void) | |||
541 | /* compose URL: use the address we want to connect to, set Host: header later */ | 542 | /* compose URL: use the address we want to connect to, set Host: header later */ |
542 | snprintf (url, DEFAULT_BUFFER_SIZE, "%s://%s:%d%s", | 543 | snprintf (url, DEFAULT_BUFFER_SIZE, "%s://%s:%d%s", |
543 | use_ssl ? "https" : "http", | 544 | use_ssl ? "https" : "http", |
544 | use_ssl & host_name != NULL ? host_name : server_address, | 545 | ( use_ssl & ( host_name != NULL ) ) ? host_name : server_address, |
545 | server_port, | 546 | server_port, |
546 | server_url | 547 | server_url |
547 | ); | 548 | ); |
diff --git a/plugins/check_procs.c b/plugins/check_procs.c index a025ee89..d672dd44 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c | |||
@@ -70,6 +70,7 @@ int options = 0; /* bitmask of filter criteria to test against */ | |||
70 | #define PCPU 256 | 70 | #define PCPU 256 |
71 | #define ELAPSED 512 | 71 | #define ELAPSED 512 |
72 | #define EREG_ARGS 1024 | 72 | #define EREG_ARGS 1024 |
73 | #define EXCLUDE_PROGS 2048 | ||
73 | 74 | ||
74 | #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads: | 75 | #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads: |
75 | ppid of procs are compared to pid of this proc*/ | 76 | ppid of procs are compared to pid of this proc*/ |
@@ -93,6 +94,9 @@ int rss; | |||
93 | float pcpu; | 94 | float pcpu; |
94 | char *statopts; | 95 | char *statopts; |
95 | char *prog; | 96 | char *prog; |
97 | char *exclude_progs; | ||
98 | char **exclude_progs_arr = NULL; | ||
99 | char exclude_progs_counter = 0; | ||
96 | char *args; | 100 | char *args; |
97 | char *input_filename = NULL; | 101 | char *input_filename = NULL; |
98 | regex_t re_args; | 102 | regex_t re_args; |
@@ -250,6 +254,25 @@ main (int argc, char **argv) | |||
250 | continue; | 254 | continue; |
251 | } | 255 | } |
252 | 256 | ||
257 | /* Ignore excluded processes by name */ | ||
258 | if(options & EXCLUDE_PROGS) { | ||
259 | int found = 0; | ||
260 | int i = 0; | ||
261 | |||
262 | for(i=0; i < (exclude_progs_counter); i++) { | ||
263 | if(!strcmp(procprog, exclude_progs_arr[i])) { | ||
264 | found = 1; | ||
265 | } | ||
266 | } | ||
267 | if(found == 0) { | ||
268 | resultsum |= EXCLUDE_PROGS; | ||
269 | } else | ||
270 | { | ||
271 | if(verbose >= 3) | ||
272 | printf("excluding - by ignorelist\n"); | ||
273 | } | ||
274 | } | ||
275 | |||
253 | /* filter kernel threads (childs of KTHREAD_PARENT)*/ | 276 | /* filter kernel threads (childs of KTHREAD_PARENT)*/ |
254 | /* TODO adapt for other OSes than GNU/Linux | 277 | /* TODO adapt for other OSes than GNU/Linux |
255 | sorry for not doing that, but I've no other OSes to test :-( */ | 278 | sorry for not doing that, but I've no other OSes to test :-( */ |
@@ -409,6 +432,7 @@ process_arguments (int argc, char **argv) | |||
409 | {"input-file", required_argument, 0, CHAR_MAX+2}, | 432 | {"input-file", required_argument, 0, CHAR_MAX+2}, |
410 | {"no-kthreads", required_argument, 0, 'k'}, | 433 | {"no-kthreads", required_argument, 0, 'k'}, |
411 | {"traditional-filter", no_argument, 0, 'T'}, | 434 | {"traditional-filter", no_argument, 0, 'T'}, |
435 | {"exclude-process", required_argument, 0, 'X'}, | ||
412 | {0, 0, 0, 0} | 436 | {0, 0, 0, 0} |
413 | }; | 437 | }; |
414 | 438 | ||
@@ -417,7 +441,7 @@ process_arguments (int argc, char **argv) | |||
417 | strcpy (argv[c], "-t"); | 441 | strcpy (argv[c], "-t"); |
418 | 442 | ||
419 | while (1) { | 443 | while (1) { |
420 | c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T", | 444 | c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T:X:", |
421 | longopts, &option); | 445 | longopts, &option); |
422 | 446 | ||
423 | if (c == -1 || c == EOF) | 447 | if (c == -1 || c == EOF) |
@@ -490,6 +514,23 @@ process_arguments (int argc, char **argv) | |||
490 | prog); | 514 | prog); |
491 | options |= PROG; | 515 | options |= PROG; |
492 | break; | 516 | break; |
517 | case 'X': | ||
518 | if(exclude_progs) | ||
519 | break; | ||
520 | else | ||
521 | exclude_progs = optarg; | ||
522 | xasprintf (&fmt, _("%s%sexclude progs '%s'"), (fmt ? fmt : ""), (options ? ", " : ""), | ||
523 | exclude_progs); | ||
524 | char *p = strtok(exclude_progs, ","); | ||
525 | |||
526 | while(p){ | ||
527 | exclude_progs_arr = realloc(exclude_progs_arr, sizeof(char*) * ++exclude_progs_counter); | ||
528 | exclude_progs_arr[exclude_progs_counter-1] = p; | ||
529 | p = strtok(NULL, ","); | ||
530 | } | ||
531 | |||
532 | options |= EXCLUDE_PROGS; | ||
533 | break; | ||
493 | case 'a': /* args (full path name with args) */ | 534 | case 'a': /* args (full path name with args) */ |
494 | /* TODO: allow this to be passed in with --metric */ | 535 | /* TODO: allow this to be passed in with --metric */ |
495 | if (args) | 536 | if (args) |
@@ -745,6 +786,8 @@ print_help (void) | |||
745 | printf (" %s\n", _("Only scan for processes with args that contain the regex STRING.")); | 786 | printf (" %s\n", _("Only scan for processes with args that contain the regex STRING.")); |
746 | printf (" %s\n", "-C, --command=COMMAND"); | 787 | printf (" %s\n", "-C, --command=COMMAND"); |
747 | printf (" %s\n", _("Only scan for exact matches of COMMAND (without path).")); | 788 | printf (" %s\n", _("Only scan for exact matches of COMMAND (without path).")); |
789 | printf (" %s\n", "-X, --exclude-process"); | ||
790 | printf (" %s\n", _("Exclude processes which match this comma seperated list")); | ||
748 | printf (" %s\n", "-k, --no-kthreads"); | 791 | printf (" %s\n", "-k, --no-kthreads"); |
749 | printf (" %s\n", _("Only scan for non kernel threads (works on Linux only).")); | 792 | printf (" %s\n", _("Only scan for non kernel threads (works on Linux only).")); |
750 | 793 | ||
@@ -786,5 +829,5 @@ print_usage (void) | |||
786 | printf ("%s\n", _("Usage:")); | 829 | printf ("%s\n", _("Usage:")); |
787 | printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n", progname); | 830 | printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n", progname); |
788 | printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n"); | 831 | printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n"); |
789 | printf (" [-C command] [-k] [-t timeout] [-v]\n"); | 832 | printf (" [-C command] [-X process_to_exclude] [-k] [-t timeout] [-v]\n"); |
790 | } | 833 | } |
diff --git a/plugins/check_swap.c b/plugins/check_swap.c index a607da1e..25d5f21d 100644 --- a/plugins/check_swap.c +++ b/plugins/check_swap.c | |||
@@ -34,9 +34,6 @@ const char *email = "devel@monitoring-plugins.org"; | |||
34 | #include "common.h" | 34 | #include "common.h" |
35 | #include "popen.h" | 35 | #include "popen.h" |
36 | #include "utils.h" | 36 | #include "utils.h" |
37 | #include <string.h> | ||
38 | #include <math.h> | ||
39 | #include <libintl.h> | ||
40 | 37 | ||
41 | #ifdef HAVE_DECL_SWAPCTL | 38 | #ifdef HAVE_DECL_SWAPCTL |
42 | # ifdef HAVE_SYS_PARAM_H | 39 | # ifdef HAVE_SYS_PARAM_H |
diff --git a/plugins/tests/check_procs.t b/plugins/tests/check_procs.t index 3af218f5..b3a0a301 100755 --- a/plugins/tests/check_procs.t +++ b/plugins/tests/check_procs.t | |||
@@ -8,7 +8,7 @@ use Test::More; | |||
8 | use NPTest; | 8 | use NPTest; |
9 | 9 | ||
10 | if (-x "./check_procs") { | 10 | if (-x "./check_procs") { |
11 | plan tests => 52; | 11 | plan tests => 54; |
12 | } else { | 12 | } else { |
13 | plan skip_all => "No check_procs compiled"; | 13 | plan skip_all => "No check_procs compiled"; |
14 | } | 14 | } |
@@ -34,9 +34,13 @@ is( $result->return_code, 0, "Checking no threshold breeched" ); | |||
34 | is( $result->output, "PROCS OK: 95 processes | procs=95;100;200;0;", "Output correct" ); | 34 | is( $result->output, "PROCS OK: 95 processes | procs=95;100;200;0;", "Output correct" ); |
35 | 35 | ||
36 | $result = NPTest->testCmd( "$command -C launchd -c 5" ); | 36 | $result = NPTest->testCmd( "$command -C launchd -c 5" ); |
37 | is( $result->return_code, 2, "Checking processes filtered by command name" ); | 37 | is( $result->return_code, 2, "Checking processes matched by command name" ); |
38 | is( $result->output, "PROCS CRITICAL: 6 processes with command name 'launchd' | procs=6;;5;0;", "Output correct" ); | 38 | is( $result->output, "PROCS CRITICAL: 6 processes with command name 'launchd' | procs=6;;5;0;", "Output correct" ); |
39 | 39 | ||
40 | $result = NPTest->testCmd( "$command -X bash -c 5" ); | ||
41 | is( $result->return_code, 2, "Checking processes excluded by command name" ); | ||
42 | is( $result->output, "PROCS CRITICAL: 95 processes with exclude progs 'bash' | procs=95;;5;0;", "Output correct" ); | ||
43 | |||
40 | SKIP: { | 44 | SKIP: { |
41 | skip 'user with uid 501 required', 4 unless getpwuid(501); | 45 | skip 'user with uid 501 required', 4 unless getpwuid(501); |
42 | 46 | ||