svn commit: r448907 - in head/net-mgmt/nagios-plugins: . files
Mathieu Arnold
mat at FreeBSD.org
Tue Aug 29 11:46:04 UTC 2017
Author: mat
Date: Tue Aug 29 11:46:03 2017
New Revision: 448907
URL: https://svnweb.freebsd.org/changeset/ports/448907
Log:
Add jail support to check_procs.
PR: 197193
Submitted by: mitsururike gmail com
Sponsored by: Absolight
Added:
head/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c (contents, props changed)
Modified:
head/net-mgmt/nagios-plugins/Makefile (contents, props changed)
head/net-mgmt/nagios-plugins/files/patch-configure (contents, props changed)
Modified: head/net-mgmt/nagios-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile Tue Aug 29 11:26:40 2017 (r448906)
+++ head/net-mgmt/nagios-plugins/Makefile Tue Aug 29 11:46:03 2017 (r448907)
@@ -3,7 +3,7 @@
PORTNAME= nagios-plugins
PORTVERSION= 2.2.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= https://www.nagios-plugins.org/download/ \
Modified: head/net-mgmt/nagios-plugins/files/patch-configure
==============================================================================
--- head/net-mgmt/nagios-plugins/files/patch-configure Tue Aug 29 11:26:40 2017 (r448906)
+++ head/net-mgmt/nagios-plugins/files/patch-configure Tue Aug 29 11:46:03 2017 (r448907)
@@ -1,20 +1,18 @@
---- configure.orig 2017-04-19 18:03:27.000000000 +0200
-+++ configure
-@@ -22004,7 +22004,7 @@
- $as_echo "$ac_cv_ps_command" >&6; }
+--- configure.orig 2017-04-19 16:03:27 UTC
++++ configure
+@@ -21973,6 +21973,15 @@ $as_echo "$as_me: error: I don't know ho
+ fi
- elif ps -axwwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
-- egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
-+ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND" > /dev/null
- then
- ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos"
- ac_cv_ps_command="$PATH_TO_PS -axwwo 'stat uid pid ppid vsz rss pcpu comm args'"
-@@ -23798,7 +23798,7 @@
- if $PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null
- then
-- ac_cv_swap_format="%*s %f %*d %f"
-+ ac_cv_swap_format="%*s %lf %*d %lf"
- ac_cv_swap_conv=1024
- { $as_echo "$as_me:$LINENO: result: using FreeBSD format swapinfo" >&5
- $as_echo "using FreeBSD format swapinfo" >&6; }
++elif ps -axwo 'stat comm vsz rss user uid pid ppid jid args' 2>/dev/null | \
++ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +JID +COMMAND" > /dev/null
++then
++ ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procjid,&procvsz,&procrss,&procpcpu,procprog,&pos"
++ ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid jid vsz rss pcpu comm args'"
++ ac_cv_ps_format="%s %d %d %d %d %d %d %f %s %n"
++ ac_cv_ps_cols=10
++ { $as_echo "$as_me:$LINENO: result: $ac_cv_ps_command" >&5
++ $as_echo "$ac_cv_ps_command" >&6; }
+ elif ps axwwo 'stat comm vsz rss user uid pid ppid args cgroup:256' 2>/dev/null | \
+ egrep -i "^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND +CGROUP" > /dev/null
+ then
Added: head/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net-mgmt/nagios-plugins/files/patch-plugins_check__procs.c Tue Aug 29 11:46:03 2017 (r448907)
@@ -0,0 +1,107 @@
+--- plugins/check_procs.c.orig 2017-01-16 17:24:03 UTC
++++ plugins/check_procs.c
+@@ -71,6 +71,7 @@ int options = 0; /* bitmask of filter cr
+ #define ELAPSED 512
+ #define EREG_ARGS 1024
+ #define CGROUP_HIERARCHY 2048
++#define JID 4096
+
+ #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads:
+ ppid of procs are compared to pid of this proc*/
+@@ -103,6 +104,7 @@ char *fails;
+ char tmp[MAX_INPUT_BUFFER];
+ int kthread_filter = 0;
+ int usepid = 0; /* whether to test for pid or /proc/pid/exe */
++int jid;
+
+ FILE *ps_input = NULL;
+
+@@ -133,6 +135,7 @@ main (int argc, char **argv)
+ int procuid = 0;
+ pid_t procpid = 0;
+ pid_t procppid = 0;
++ int procjid = 0;
+ pid_t kthread_ppid = 0;
+ int procvsz = 0;
+ int procrss = 0;
+@@ -236,9 +239,9 @@ main (int argc, char **argv)
+ 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",
+++ printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n",
+ procs, procuid, procvsz, procrss,
+- procpid, procppid, procpcpu, procstat,
++ procpid, procppid, procjid, procpcpu, procstat,
+ procetime, procprog, procargs);
+ if (strstr(PS_COMMAND, "cgroup") != NULL) {
+ printf(" proc_cgroup_hierarchy=%s\n", proc_cgroup_hierarchy);
+@@ -287,6 +290,8 @@ main (int argc, char **argv)
+ resultsum |= PROG;
+ if ((options & PPID) && (procppid == ppid))
+ resultsum |= PPID;
++ if ((options & JID) && (procjid == jid))
++ resultsum |= JID;
+ if ((options & USER) && (procuid == uid))
+ resultsum |= USER;
+ if ((options & VSZ) && (procvsz >= vsz))
+@@ -315,9 +320,9 @@ main (int argc, char **argv)
+
+ 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",
+++ printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n",
+ procuid, procvsz, procrss,
+- procpid, procppid, procpcpu, procstat,
++ procpid, procppid, procjid, procpcpu, procstat,
+ procetime, procprog, procargs);
+ if (strstr(PS_COMMAND, "cgroup") != NULL) {
+ printf(" cgroup_hierarchy=%s\n", cgroup_hierarchy);
+@@ -438,6 +443,7 @@ process_arguments (int argc, char **argv
+ {"no-kthreads", required_argument, 0, 'k'},
+ {"traditional-filter", no_argument, 0, 'T'},
+ {"cgroup-hierarchy", required_argument, 0, 'g'},
++ {"jid", required_argument, 0, 'j'},
+ {0, 0, 0, 0}
+ };
+
+@@ -446,7 +452,7 @@ process_arguments (int argc, char **argv
+ strcpy (argv[c], "-t");
+
+ while (1) {
+- c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tg:",
++ c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tg:j:",
+ longopts, &option);
+
+ if (c == -1 || c == EOF)
+@@ -477,6 +483,12 @@ process_arguments (int argc, char **argv
+ break;
+ }
+ usage4 (_("Parent Process ID must be an integer!"));
++ case 'j': /* jail id */
++ if (sscanf (optarg, "%d%[^0-9]", &jid, tmp) == 1) {
++ asprintf (&fmt, "%s%sJID = %d", (fmt ? fmt : "") , (options ? ", " : ""), jid);
++ options |= JID;
++ break;
++ }
+ case 's': /* status */
+ if (statopts)
+ break;
+@@ -766,6 +778,8 @@ print_help (void)
+ 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", "-j, --jid=JID");
++ printf (" %s\n", _("Only scan for process running in jail which ID is JID."));
+ printf (" %s\n", "-z, --vsz=VSZ");
+ printf (" %s\n", _("Only scan for processes with VSZ higher than indicated."));
+ printf (" %s\n", "-r, --rss=RSS");
+@@ -818,7 +832,7 @@ void
+ print_usage (void)
+ {
+ printf ("%s\n", _("Usage:"));
+- printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n", progname);
++ printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid] [-j jid]\n", progname);
+ printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n");
+ printf (" [-C command] [-k] [-t timeout] [-v]\n");
+ }
More information about the svn-ports-all
mailing list