From owner-svn-ports-all@freebsd.org Tue Aug 29 14:37:12 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F2CF5DDCCC7; Tue, 29 Aug 2017 14:37:12 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CA20B6458B; Tue, 29 Aug 2017 14:37:12 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7TEbCJt072964; Tue, 29 Aug 2017 14:37:12 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7TEbBXT072960; Tue, 29 Aug 2017 14:37:11 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201708291437.v7TEbBXT072960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 29 Aug 2017 14:37:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r448920 - in head/net-mgmt/monitoring-plugins: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head/net-mgmt/monitoring-plugins: . files X-SVN-Commit-Revision: 448920 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Aug 2017 14:37:13 -0000 Author: mat Date: Tue Aug 29 14:37:11 2017 New Revision: 448920 URL: https://svnweb.freebsd.org/changeset/ports/448920 Log: Add jail id support to check_procs here too. Sponsored by: Absolight Added: head/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c (contents, props changed) head/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c (contents, props changed) Modified: head/net-mgmt/monitoring-plugins/Makefile (contents, props changed) head/net-mgmt/monitoring-plugins/files/patch-configure (contents, props changed) Modified: head/net-mgmt/monitoring-plugins/Makefile ============================================================================== --- head/net-mgmt/monitoring-plugins/Makefile Tue Aug 29 14:32:48 2017 (r448919) +++ head/net-mgmt/monitoring-plugins/Makefile Tue Aug 29 14:37:11 2017 (r448920) @@ -3,7 +3,7 @@ PORTNAME= monitoring-plugins PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-mgmt MASTER_SITES= https://www.monitoring-plugins.org/download/ LOCAL/mat/${PORTNAME} Modified: head/net-mgmt/monitoring-plugins/files/patch-configure ============================================================================== --- head/net-mgmt/monitoring-plugins/files/patch-configure Tue Aug 29 14:32:48 2017 (r448919) +++ head/net-mgmt/monitoring-plugins/files/patch-configure Tue Aug 29 14:37:11 2017 (r448920) @@ -1,11 +1,19 @@ --- configure.orig 2016-11-29 08:48:11 UTC +++ configure -@@ -16748,7 +16748,7 @@ then +@@ -16747,6 +16747,16 @@ then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 $as_echo "$ac_cv_ps_command" >&6; } ++elif ps -axwo 'stat comm vsz rss user uid pid ppid args jid' 2>/dev/null | \ ++ egrep -i "^ *STAT +COMMAND +VSZ +RSS +USER +UID +PID +PPID +COMMAND +JID" > /dev/null ++then ++ ac_cv_ps_varlist="procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos" ++ ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'" ++ ac_cv_ps_format="%s %d %d %d %d %d %f %s %n" ++ ac_cv_ps_cols=9 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ps_command" >&5 ++$as_echo "$ac_cv_ps_command" >&6; } ++ elif ps -axwo '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 + egrep -i "^ *STAT +[UCOMAND]+ +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 -axwo 'stat uid pid ppid vsz rss pcpu comm args'" Added: head/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/monitoring-plugins/files/patch-plugins_check__nagios.c Tue Aug 29 14:37:11 2017 (r448920) @@ -0,0 +1,10 @@ +--- plugins/check_nagios.c.orig 2016-11-29 08:45:08 UTC ++++ plugins/check_nagios.c +@@ -64,6 +64,7 @@ main (int argc, char **argv) + int procuid = 0; + int procpid = 0; + int procppid = 0; ++ int procjid = 0; + int procvsz = 0; + int procrss = 0; + float procpcpu = 0; Added: head/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/monitoring-plugins/files/patch-plugins_check__procs.c Tue Aug 29 14:37:11 2017 (r448920) @@ -0,0 +1,107 @@ +--- plugins/check_procs.c.orig 2016-11-29 08:45:08 UTC ++++ plugins/check_procs.c +@@ -70,6 +70,7 @@ int options = 0; /* bitmask of filter cr + #define PCPU 256 + #define ELAPSED 512 + #define EREG_ARGS 1024 ++#define JID 2048 + + #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads: + ppid of procs are compared to pid of this proc*/ +@@ -101,6 +102,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; + +@@ -130,6 +132,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; +@@ -230,9 +233,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\n", ++ 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); + + /* Ignore self */ +@@ -275,6 +278,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)) +@@ -292,9 +297,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\n", ++ 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); + } + +@@ -409,6 +414,7 @@ process_arguments (int argc, char **argv + {"input-file", required_argument, 0, CHAR_MAX+2}, + {"no-kthreads", required_argument, 0, 'k'}, + {"traditional-filter", no_argument, 0, 'T'}, ++ {"jid", required_argument, 0, 'j'}, + {0, 0, 0, 0} + }; + +@@ -417,7 +423,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:T", ++ c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tj:", + longopts, &option); + + if (c == -1 || c == EOF) +@@ -451,6 +457,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; +@@ -731,6 +743,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"); +@@ -779,7 +793,7 @@ void + print_usage (void) + { + printf ("%s\n", _("Usage:")); +- printf ("%s -w -c [-m metric] [-s state] [-p ppid]\n", progname); ++ printf ("%s -w -c [-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"); + }