Changes committed to git://git.pcp.io/pcp.git master
Nathan Scott (8):
build: trivial code change to fix the Mingw build
pmwebd: add an option to disable service advertising
pmdavmware: add host option, apparently mandatory nowadays
rc_pmcd: speed up pmcd shutdown, init scripts aspects
pmcd: enabled pmdaroot-starting-pmdas by default now.
libpcp: add pmRegisterDerivedMetric for friendlier error handling
containers: resolve a promised TODO item in pmwebd container
docs: add changelogs and update deb copyright notice list
Ken McDonell (7):
qa/983: take better control of restarting pmcd+pmlogger @ end
qa/370.out.6: remade after recent sar2pcp changes with more metrics
src/libpcp/src/derive.c: ensure error message buffer set in all failure
cases
qa/1069: add notrun guard for python OrderedDict module not installed
qa/370.out.5: remade after recent sar2pcp changes with more metrics
src/libpcp/src/derive.c: fix small initialization error
qa/225: remade .out after most recent libpcp derived metric parser changes
Lukas Berk (3):
qa/983 update output
Update Opts:: usage in pmdavmware.pl
qa/983 - ensure pmcd has stopped before restarting
Mark Goodwin (1):
containers: add pcp-pmwebd container to serve pcp-webapi requests.
Marko Myllynen (1):
python: use pmGetNonOptionsFromList not deprecated pmNonOptionsFromList
CHANGELOG | 37 ++++++++++-
build/containers/GNUmakefile | 2
build/containers/pcp-pmwebd/Dockerfile | 50 ++++++++++++++-
build/containers/pcp-pmwebd/GNUmakefile | 29 ++++++++
build/rpm/fedora.spec | 4 -
debian/copyright | 24 +++----
debian/libpcp3-dev.install | 1
man/man1/pmwebd.1 | 12 +++
man/man3/pmderivederrstr.3 | 13 +++
man/man3/pmparseinterval.3 | 4 -
man/man3/pmregisterderived.3 | 50 ++++++++++++++-
qa/1069 | 10 +--
qa/200 | 34 +++++-----
qa/200.out | 12 +--
qa/225 | 8 ++
qa/225.out | 52 +++++++++++++++
qa/259.out | 2
qa/370.out.5 | 35 ++++++++++
qa/370.out.6 | 105 ++++++++++++++++++++++++++++++++
qa/727 | 23 ++++++-
qa/727.out | 1
qa/803 | 26 +++++++
qa/803.out | 8 ++
qa/968 | 2
qa/983 | 6 +
qa/983.out | 2
qa/common.avahi | 6 +
qa/group | 1
qa/src/.gitignore | 1
qa/src/GNUlocaldefs | 2
qa/src/derived.c | 57 +++++++++++++++++
qa/src/procpid.python | 2
qa/src/recon.c | 8 --
qa/src/test_pcp.python | 2
qa/src/test_pcp_getopts.python | 2
qa/src/test_pcp_options.python | 2
src/include/pcp/pmapi.h | 1
src/libpcp/src/derive.c | 52 +++++++++++++++
src/libpcp/src/exports | 1
src/libpcp/src/getopt.c | 2
src/libpcp_pmda/src/pduroot.c | 1
src/pcp/dmcache/pcp-dmcache.py | 2
src/pcp2graphite/pcp2graphite.py | 2
src/pmcd/pmcd.defaults | 2
src/pmcd/rc_pmcd | 4 -
src/pmcd/src/config.c | 12 +--
src/pmdas/vmware/pmdavmware.pl | 19 +++--
src/pmwebapi/main.cxx | 16 +++-
src/python/pcp/pmapi.py | 21 +++---
49 files changed, 668 insertions(+), 102 deletions(-)
commit b090fb3d5e9b08d2f8d270e3348b460448583aa8
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jan 27 16:00:49 2016 +1100
docs: add changelogs and update deb copyright notice list
commit f08d7e7d3913f5444f57c8adb2067a0dab8bb20d
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jan 27 15:58:58 2016 +1100
containers: resolve a promised TODO item in pmwebd container
commit 539ea77b48a12e19f658fbc3c247d1517c7d2a50
Author: Mark Goodwin <mgoodwin@xxxxxxxxxx>
Date: Wed Jan 27 14:44:39 2016 +1100
containers: add pcp-pmwebd container to serve pcp-webapi requests.
This adds a pcp-pmwebd container. It needs a local pmcd service,
which can be provided either by a regular local pmcd on the host
_or_ by a running pcp-collector container. It listens on the default
pmwebd port (44323 by default). This can be changed by editing
pmwed.options in the container.
Host platforms that don't have an active avahi service will need
to add the new pmwebd -S flag in the pmwebd.options file in the
container to disable service advertising (see Nathan's follow-up
commit for this).
modified: build/containers/GNUmakefile
new file: build/containers/pcp-pmwebd/Dockerfile
new file: build/containers/pcp-pmwebd/GNUmakefile
commit 4e40e24e807d7412b93969f3030332691272bd7c
Author: Marko Myllynen <myllynen@xxxxxxxxxx>
Date: Wed Jan 27 13:43:38 2016 +1100
python: use pmGetNonOptionsFromList not deprecated pmNonOptionsFromList
commit f0f25528ab0acfc53e494c85186bffff0c4abcba
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jan 27 13:41:56 2016 +1100
libpcp: add pmRegisterDerivedMetric for friendlier error handling
Adds a convenience routine akin to pmRegisterDerived that does similar
error reporting to pmLoadDerivedConfig, and that is modelled on the
likes of pmParseInterval (caller gets a buffer to free on error).
Test program added to exercise the C API, and python tests extended to
verify access from python-land, where errors parsing derived metrics
are now handled like all other exceptions.
Along with Ken's previous commit, resolves Fedora BZ #1299806.
commit 62eeba6a9f05d04f3c22bbbf81e835a6fe7e06a6
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jan 27 13:31:56 2016 +1100
pmcd: enabled pmdaroot-starting-pmdas by default now.
QA has been consistently happy it with for a few days, so
flick the switch.
commit e24ce21b80d87db22175d624d3eac60cbf1b2530
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jan 27 13:05:21 2016 +1100
rc_pmcd: speed up pmcd shutdown, init scripts aspects
Remove the final source of significant slowness in pmcd
shutdown. Required updates to test 200 which has some
built-in requirements that stopping pmcd takes several
seconds. Test 200 now also runs in half the time as an
added bonus (65sec -> 32sec) - win, win.
Resolves Fedora BZ #1292027.
commit c30424623d5bc57c705ada83415583bfb453fb42
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jan 27 11:26:34 2016 +1100
pmdavmware: add host option, apparently mandatory nowadays
commit 0fc9e78914f5c55a976de102c4ba992e6d9798f0
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jan 27 11:14:52 2016 +1100
pmwebd: add an option to disable service advertising
Folks building containers with pmwebd report problems with
contacting Avahi. Add an option to pmwebd as was done for
pmcd (unfortunately -A already taken). Thanks for review,
Mark.
Test qa/727 gets an update to verify this functionality.
commit 36fcadc42e22734b46253c33ed8dcf9b0267fd3d
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed Jan 27 07:00:27 2016 +1100
qa/225: remade .out after most recent libpcp derived metric parser changes
commit 2c05ba2a4880f0c88a204497f7f6137004c03213
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed Jan 27 06:57:23 2016 +1100
src/libpcp/src/derive.c: fix small initialization error
When parsing more than one derived metric configuration and a syntax
error is encountered in one definition, the lexical scanner may have
returning the wrong character at the start of a subsequent parse.
commit f349f93ccb9773568da99abb867c15d8647f2047
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed Jan 27 06:30:46 2016 +1100
qa/370.out.5: remade after recent sar2pcp changes with more metrics
commit 45a3112ee8480d603ef06c9b59600d631b02c83b
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed Jan 27 06:29:12 2016 +1100
qa/1069: add notrun guard for python OrderedDict module not installed
commit d861c9f981102b42a924928e7a00a44a1d2b7469
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Mon Jan 25 14:39:52 2016 -0500
qa/983 - ensure pmcd has stopped before restarting
follow up to faca8fc, adding _wait_pmcd_end to the cleanup routine to
ensure there isn't a race condition between the pmsignal and pcp restart
commit 5e3b7af0e564026710393384881353b584845131
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Fri Jan 22 16:29:22 2016 -0500
Update Opts:: usage in pmdavmware.pl
After some discussions on pcp.freenode.net, it seemed that pmdavmware's
usage of the Opts methods are (were?) no longer valid. This patch
appeared to fix the pmda startup issue experienced by the user.
commit b62cc334e430b712247c9feed35ce45b603122fc
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Fri Jan 22 16:25:51 2016 -0500
qa/983 update output
pmsignal should already have killed the pmcd process. Drop the 'Waiting
for pmcd to terminate ...' output produced by the pcp restart from the
output.
commit 873d942c6a80eb902adfedfb6455ac45c2bf9468
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue Jan 26 16:30:00 2016 +1100
src/libpcp/src/derive.c: ensure error message buffer set in all failure
cases
If pmRegisterDerived() (or pmLoadDerivedConfig()) encounters an error,
make sure the error buffer (as returned via pmDerivedErrStr()) is set
to something meaningful.
Some QA tweaks as a result to increase coverage and to accommodate
additional error information in the output now.
commit 133663a9ab92f70e7756b2ea39a8f22d067e5aeb
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue Jan 26 16:29:22 2016 +1100
qa/370.out.6: remade after recent sar2pcp changes with more metrics
commit 2dc3971735bd0b6db6984d9c0d7eafe8ee16ad7f
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue Jan 26 16:28:15 2016 +1100
qa/983: take better control of restarting pmcd+pmlogger @ end
commit cf5e23a93d88420bca29b5be206b800845e55546
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Tue Jan 26 07:45:54 2016 +1100
build: trivial code change to fix the Mingw build
|