Changes committed to git://git.pcp.io/nathans/pcp.git master
Nathan Scott (5):
qa: add a second scsi message filter for transient devices
qa: tweak qa/888 to fail instead of notrun if it cannot find src
build: fix some recently added typos in comments
build: correct rpm package dependency on pcp-libs version
build: allow pmdajson configure on/off build overrides
Lukas Berk (2):
Add ipc shared memory metrics for total, rss, and swap in pmdalinux
Add qa/888 for testing latest ipc.shm metrics
Mark Goodwin (1):
build: Makepkgs --with-containers for platforms with RPM and docker.
Makepkgs | 48 ++++++++++++++++++++++
build/GNUmakefile | 2
build/containers/GNUlocalrules | 15 ++++---
build/containers/GNUmakefile | 6 --
build/containers/pcp-base/Dockerfile | 21 ++++-----
build/containers/pcp-base/GNUmakefile | 16 +++++--
build/containers/pcp-collector/Dockerfile | 2
build/containers/pcp-collector/GNUmakefile | 4 -
build/containers/pcp-monitor/Dockerfile | 2
build/containers/pcp-monitor/GNUmakefile | 4 -
build/containers/pcp-pmlogger/Dockerfile | 2
build/containers/pcp-pmlogger/GNUmakefile | 4 -
build/containers/pcp-testsuite/Dockerfile | 2
build/containers/pcp-testsuite/GNUmakefile | 4 -
build/rpm/fedora.spec | 2
configure | 22 +++++++++-
configure.ac | 17 ++++++--
qa/888 | 61 +++++++++++++++++++++++------
qa/888.out | 16 +++++++
qa/common.filter | 1
qa/group | 1
qa/src/GNUlocaldefs | 6 ++
qa/src/qa_shmctl.c | 15 +++++++
src/pmdas/linux/clusters.h | 1
src/pmdas/linux/help | 3 +
src/pmdas/linux/ipc.c | 14 ++++++
src/pmdas/linux/ipc.h | 8 +++
src/pmdas/linux/pmda.c | 36 +++++++++++++++++
src/pmdas/linux/root_linux | 3 +
29 files changed, 278 insertions(+), 60 deletions(-)
commit fcb28f301d2ef96c75dcab2e4f988293a32010f8
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jun 22 17:11:34 2015 +1000
build: allow pmdajson configure on/off build overrides
commit f5403daa472ad520579bc2dad027aa9df40102d5
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jun 22 17:10:01 2015 +1000
build: correct rpm package dependency on pcp-libs version
commit 77173005e8fbe404e2870f571fc20a054d3d019f
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jun 22 16:58:36 2015 +1000
build: fix some recently added typos in comments
commit 3d22ea2f7123718ddcbc0807622d93706f4e9149
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Jun 22 16:24:20 2015 +1000
qa: tweak qa/888 to fail instead of notrun if it cannot find src
commit 260a7fb274b28bc71c43138685cce1a426f0f417
Author: Mark Goodwin <mgoodwin@xxxxxxxxxx>
Date: Fri Jun 19 16:39:20 2015 +1000
build: Makepkgs --with-containers for platforms with RPM and docker.
Infrustructure to build container images using Makepkgs --with-containers
The default and install targets now descend into build/containers for any
prep (currently none but that may change in the future). The pack_pcp
target will build and package RPMs and then descend into build/containers
to build the pcp containers using the RPM packages built from build/rpm.
A simple dnf (aka yum) repo is constructed for the RPM packages in the
pcp-base container (/tmp/RPMS in the container). Because all other PCP
containers are layered on the pcp-base container, this repo is available
to install additional PCP packages. This is especially important for the
pcp-collector container where users can run the following to login to the
running container: docker exec -it pcp-collector /bin/bash -l
and install additional PMDA packages, ./Install additional/optional PMDAs
or perform other PCP administrative tasks. The pcp-devel repo is not enabled
by default. Use e.g. : dnf --enable-repo=pcp-devel install pcp-somepmda
If you don't enable the pcp-devel repo, you fall-back to the standard
fedora:latest repo (curently f22 and f22-updates), which may be what you
want anyway.
Note that the containers build requires access to the docker daemon's unix
domain socket. This is only permitted by default to the root user. You
can edit /etc/sysconfig/docker and specify OPTIONS="-g groupname" to allow
users in the group 'groupname' access to the docker server. Pick a group
that
you are a member of. There are checks in the Makepkgs script for sufficient
docker server access. The --with-containers build will fail of those checks
do not succeed. Obviously the docker service will need to be enabled and
started for this to work too.
Finally - there is still no cron service for the pmlogger-daily scripts
et al. THis is still work in progress - will probably implement this with
another container based on crond, using docker exec to run the scripts.
modified: Makepkgs
modified: build/GNUmakefile
modified: build/containers/GNUlocalrules
modified: build/containers/GNUmakefile
modified: build/containers/pcp-base/Dockerfile
modified: build/containers/pcp-base/GNUmakefile
modified: build/containers/pcp-collector/Dockerfile
modified: build/containers/pcp-collector/GNUmakefile
modified: build/containers/pcp-monitor/Dockerfile
modified: build/containers/pcp-monitor/GNUmakefile
modified: build/containers/pcp-pmlogger/Dockerfile
modified: build/containers/pcp-pmlogger/GNUmakefile
modified: build/containers/pcp-testsuite/Dockerfile
modified: build/containers/pcp-testsuite/GNUmakefile
commit 94d1db179edc0018b3963d9a1ae530e4c1cfab28
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Thu Jun 18 16:54:59 2015 -0400
Add qa/888 for testing latest ipc.shm metrics
commit 6842babc844e93b76155aac97ff4d7c7f6200c8a
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Thu Jun 18 09:27:39 2015 -0400
Add ipc shared memory metrics for total, rss, and swap in pmdalinux
commit aef880ab9a79eeda3651b44c80a4e3f4be48bba5
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu Jun 18 14:03:31 2015 +1000
qa: add a second scsi message filter for transient devices
|