This is a rather large and important merge with pretty major
RPM packaging changes in build/rpm/pcp.spec.in, as described
below. The Fedora spec and Debian packaging are still future
work.
note: github is back up and the mirror has now sync'd again.
Changes committed to git://git.pcp.io/pcp.git master
Lukas Berk (28):
Update pmdapapi papi_store function to actually loop through pmid's
PR1073 - pmlogger --PID lifetime tracking functionality
Separate Perl pmda's and pmda bindings
Split python pmdas into their own sub packages
move pmatop under pcp-atop
move pmiostat under pcp-iostat
move pmcollectl under pcp-collectl
move pcp2graphite under pcp-2graphite
Break src/pcp/ monitoring tools into their own sub package
Robustify testsuite in cases prereqs aren't installed
Tweak location of the pmda check notrun
Add varios dependency checks for testcase 366
Move perl and python dependencies to their respective packages
Separate non default pmdas written in C, robustify related tests
Update spin-rawhide to address packaging guideline concerns
Robustify testsuite a bit more
Add pcp-compat package as per fedora packaging guidelines for existing
fedoras
Add pcp-system-tools to compat package
Move man pages into the pcp-docs package
If pcp-tool(1) program is not installed, have pcp.sh suggest installation
Build the pmns during pcp setup in spec file
Fix up pcp.spec.in after merge from 3.10.4 release mangled a few things
Force restart for postfix pmda installation
Add pcp-monitor and pcp-collection meta packages to pcp.spec.in
Renable systemd pmda package with reworked regex in file selection
Fix up Makefiles that were overwritten by merge adjust pcp.spec.in
Rename pcp-pmda-nvidia rpm to pcp-pmda-nvidia-gpu
Add pcp-doc to pcp-compat deps to avoid losing man pages on upgrade
Nathan Scott (6):
Tweak pcp-compat requires to main pcp package, fix spelling issues
build: rpm packaging split updates building on Lukas' work
build: pcp-pmda-systemtap package superceded by json
qa: extend filters for 359 for some elasticsearch versions
qa: make 769 handle existing outfile symlink override
build: add rpm conflict handling for pcp command in librapi
Martins Innus (2):
Add new PM_ERR_BADSTORE error and other error fixups
Label the metrics in store/fetch in pmdas/linux_proc
David Disseldorp (1):
Add configure psproc check for /bin/bash for open build systems
Mark Goodwin (1):
Fix rpm-devel issue in pcp.spec.in
build/rpm/GNUmakefile | 5
build/rpm/fedora.spec | 3
build/rpm/pcp.spec.in | 1799 ++++++++++++++++++++++++++++++-------
configure | 26
configure.ac | 26
man/man1/pmlogger.1 | 13
qa/.gitignore | 1
qa/006.out | 2
qa/1049 | 3
qa/1051 | 2
qa/154 | 3
qa/258 | 3
qa/323 | 3
qa/336 | 3
qa/346 | 3
qa/349 | 2
qa/355 | 3
qa/359 | 1
qa/366 | 10
qa/376 | 3
qa/379 | 3
qa/383 | 3
qa/421 | 3
qa/426 | 3
qa/445 | 3
qa/511 | 1
qa/525 | 3
qa/527 | 5
qa/537 | 5
qa/565 | 3
qa/597 | 3
qa/601 | 3
qa/602 | 2
qa/642 | 4
qa/656 | 3
qa/660 | 1
qa/670 | 4
qa/703 | 3
qa/711 | 1
qa/744 | 4
qa/745 | 4
qa/748 | 2
qa/755 | 4
qa/763 | 3
qa/769 | 36
qa/769.out | 8
qa/769.out.1 | 17
qa/769.out.2 | 21
qa/769.out.3 | 21
qa/769.out.4 | 25
qa/827 | 8
qa/947 | 46
qa/947.out | 8
qa/982.out | 2
qa/GNUmakefile | 8
qa/group | 1
qa/pmdas/GNUmakefile | 4
qa/pmdas/GNUmakefile.install | 4
qa/src/GNUlocaldefs | 4
scripts/spin-rawhide | 11
src/GNUmakefile | 5
src/include/builddefs.in | 5
src/include/pcp/pmapi.h | 1
src/libpcp/src/err.c | 2
src/pcp/2graphite/GNUmakefile | 64 -
src/pcp/2graphite/pcp-2graphite.py | 538 +++++------
src/pcp/GNUmakefile | 10
src/pcp/atop/GNUmakefile | 33
src/pcp/atop/pcp-atop.py | 940 +++++++++++++++++++
src/pcp/collectl/GNUmakefile | 31
src/pcp/collectl/pcp-collectl.py | 705 ++++++++++++++
src/pcp/dmcache/GNUmakefile | 4
src/pcp/free/GNUmakefile | 4
src/pcp/iostat/GNUmakefile | 39
src/pcp/iostat/pcp-iostat.py | 211 ++++
src/pcp/numastat/GNUmakefile | 6
src/pcp/pcp.sh | 14
src/pcp/uptime/GNUmakefile | 4
src/pcp/verify/GNUmakefile | 4
src/pcp2graphite/GNUmakefile | 66 -
src/pcp2graphite/pcp2graphite.py | 538 +++++------
src/perl/PMDA/PMDA.pm | 10
src/perl/PMDA/cvalue.c | 4
src/pmatop/GNUmakefile | 30
src/pmatop/pmatop.py | 940 -------------------
src/pmcollectl/GNUmakefile | 30
src/pmcollectl/pmcollectl.py | 705 --------------
src/pmdas/GNUmakefile | 12
src/pmdas/linux_proc/contexts.c | 4
src/pmdas/linux_proc/pmda.c | 424 ++++----
src/pmdas/logger/event.c | 2
src/pmdas/logger/logger.c | 2
src/pmdas/mmv/src/mmv.c | 2
src/pmdas/papi/papi.c | 57 -
src/pmdas/pmcd/src/pmcd.c | 6
src/pmdas/postfix/Install | 2
src/pmdas/sample/src/sample.c | 12
src/pmdas/simple/GNUmakefile | 4
src/pmdas/simple/pmdasimple.perl | 6
src/pmdas/simple/pmdasimple.python | 6
src/pmdas/simple/simple.c | 6
src/pmdas/trace/src/trace.c | 2
src/pmiostat/GNUmakefile | 34
src/pmiostat/pmiostat.py | 211 ----
src/pmlogger/src/pmlogger.c | 24
src/python/GNUmakefile | 2
src/python/pmapi.c | 2
107 files changed, 4749 insertions(+), 3225 deletions(-)
Details ...
commit d49dadc5977493e3f28d44f2cbb66fdb25a91eb9
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu May 7 12:54:17 2015 +1000
build: add rpm conflict handling for pcp command in librapi
Resolves oss BZ #859 as best we can hope to at this stage.
commit c0d42038f3e8e96480adbfd32f2f837d8cf8347e
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu May 7 12:40:34 2015 +1000
qa: make 769 handle existing outfile symlink override
commit 2e06967decd7fd4624d4d316e47639bda2e23a85
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu May 7 12:40:08 2015 +1000
qa: extend filters for 359 for some elasticsearch versions
commit 06a252de4e65845253b4f28bdee0812660789cc3
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu May 7 10:22:25 2015 +1000
build: pcp-pmda-systemtap package superceded by json
Package was catching only the pmcd tapset, which belongs in pcp.
commit 069d91e44f0edfb35f19415788535a432fa0bf42
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Wed May 6 17:45:14 2015 -0400
Add pcp-doc to pcp-compat deps to avoid losing man pages on upgrade
Signed-off-by: Lukas Berk <lberk@xxxxxxxxxx>
commit eeb32b2849375a1d84e9566ea96a30e1c89e3dae
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Wed May 6 16:35:57 2015 -0400
Rename pcp-pmda-nvidia rpm to pcp-pmda-nvidia-gpu
Using the name pcp-pmda-nvidia conflicts with older pcp versions,
renaming this package avoids the 'conflicts' statements.
Signed-off-by: Lukas Berk <lberk@xxxxxxxxxx>
commit d8fa42ffabcc31b565a57f20037f90b328995add
Author: Martins Innus <minnus@xxxxxxxxxxx>
Date: Wed May 6 15:20:22 2015 +0000
Label the metrics in store/fetch in pmdas/linux_proc
commit d14849ae9fbe80cb625c90246c9b3e1ab56a8a2e
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed May 6 16:23:42 2015 +1000
build: rpm packaging split updates building on Lukas' work
Handful of smaller issues tackled here:
- put in place back-compat symlinks for some py commands
(needs to be makefile-driven too, not spec driven as this
affects all build platforms, not rpm alone)
- many commands support both py2 and py3, so switching over
makefiles to py2 only was NQR - introduce HAVE_PYTHON for
makefiles needing to know only if *some* supported python
version has been found.
- pcp2graphite packaging work, more like the other "2"pcp
utilities (this one may need to become a daemon someday).
- prefer python3 over python2 in packaging dependencies
- fix conditionals around pcp-pmda-systemd package to make
use of configure'd state, as per other pmda packages.
commit cb5f2c1cc9bbf9e65cd0589dcd0f81f79bbac1b9
Author: David Disseldorp <ddiss@xxxxxxx>
Date: Tue May 5 19:53:18 2015 -0400
Add configure psproc check for /bin/bash for open build systems
commit 28b33e9bdc927383a947930939efbcc1785c207c
Author: Mark Goodwin <mgoodwin@xxxxxxxxxx>
Date: Tue May 5 15:18:38 2015 -0400
Fix rpm-devel issue in pcp.spec.in
commit a30a3fa475c8dab2e3368907a507a409cd5e9934
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Tue May 5 15:16:49 2015 -0400
Fix up Makefiles that were overwritten by merge adjust pcp.spec.in
commit cb88f602c42ff489be6ea182f17c702bff484b62
Author: Martins Innus <minnus@xxxxxxxxxxx>
Date: Tue May 5 19:14:49 2015 +0000
Add new PM_ERR_BADSTORE error and other error fixups
Add a new error code: PM_ERR_BADSTORE, deal with bad input
to pmstore. Update the relevant pmdas to use this new code
and generate new qa output for relevant tests.
Add this code to the perl and python bindings. In doing
so, I found some missing error codes, so added those.
commit 629fc9f3621b54b866f84dbb27f1d08cd52a3a8a
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Mon May 4 14:18:13 2015 -0400
Renable systemd pmda package with reworked regex in file selection
commit 7a534c11b00247e5ef4b097b3d6b44c5e0d59177
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon May 4 10:21:31 2015 -0400
Tweak pcp-compat requires to main pcp package, fix spelling issues
commit 1527fd1fe1d7cdf8a3babea34f4461b08bb530da
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Tue Apr 28 18:25:02 2015 -0400
Add pcp-monitor and pcp-collection meta packages to pcp.spec.in
To help in making installation of now-split pcp packges, pcp-monitor
and pcp-collection meta packages will allow the user to easily choose
a focused selection of packages.
commit 17c48454790627e5a9ad2ff4273d94f026e16c20
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Tue Apr 28 09:58:56 2015 -0400
Force restart for postfix pmda installation
The postfix pmda requires being installed by root to change the gid
to postfix. Switch the required option in the Install script.
commit 357c852d019086aa492841a4f770db5d6b8604d0
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Tue Apr 21 09:46:03 2015 -0400
Fix up pcp.spec.in after merge from 3.10.4 release mangled a few things
commit 6fede86a8c57d0bd70de9fda8d2cde862e450511
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Thu Apr 16 10:39:39 2015 -0400
Build the pmns during pcp setup in spec file
Attempt to build the pmns during pcp installation (not pmcd service start)
commit 0586b9a24714abcb53536d6228b0a100d02de919
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Thu Mar 26 11:24:58 2015 -0400
If pcp-tool(1) program is not installed, have pcp.sh suggest installation
Since the pcp-python tools have been split into their own package, it
would be helpful to suggest a package to install (pcp-system-tools).
Lets do that. Perhaps later we can detect the OS/linux distro, and give
a most specific command the user could simply copy and paste.
commit 428db3eb12bb0dc20e211f26bf5be0aa6d9cc1fe
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Thu Mar 26 11:23:53 2015 -0400
Move man pages into the pcp-docs package
commit 802217875e36f86a8de0f597bbb540d06b93aea2
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Tue Mar 24 17:33:12 2015 -0400
Add pcp-system-tools to compat package
commit bd1424aec55a292b6934673caeb1f24d5a817d54
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Tue Mar 24 17:31:25 2015 -0400
Add pcp-compat package as per fedora packaging guidelines for existing
fedoras
In order to not break existing installs on fedora, we need to create a
compat
package, that is temporary, to require the (now optional) packages
commit 37f6675fd0b578827a81042e43c336cf7689e674
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Tue Mar 24 15:00:02 2015 -0400
Robustify testsuite a bit more
A few more fixes after breaking C pdma's into their own packages
commit 3467d8a883badd9fcaf560c1397d24420f666696
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Mon Mar 23 10:45:03 2015 -0400
Update spin-rawhide to address packaging guideline concerns
some fedora packing guidelines were raised in BZ1204467 addressing
the versioning issues caused by spin-rawhide here. Also updating
the location of webjs sources.
commit 7c9ef29b17d43625fbaa17fc8e6f9e488339d6b4
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Fri Mar 20 18:29:48 2015 -0400
Separate non default pmdas written in C, robustify related tests
build/rpm/pcp.spec.in - apache, bash, cifs, cisco, gfs2, lmsensors,
mailq, mounts, nvidia, roomtemp, rpm, sendmail,
shping, summary, trace, weblog pmdas seperated
qa/* - update various testcases if components are not installed
commit a8156519db19c03ec4f779d3f57494c45af74938
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Wed Mar 18 17:52:09 2015 -0400
Move perl and python dependencies to their respective packages
Have the base perl/python dependencies move to the specific library
binding packages instead of the base PCP.
commit e8fd4b0542837debea42fbd8fd0a7984b0ac99f3
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Wed Mar 18 17:51:34 2015 -0400
Add varios dependency checks for testcase 366
qa/366 add notrun checks for the pmda it tests with
commit 254547f81a78313b395bdedf40df57056a741b3f
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Tue Mar 17 14:45:57 2015 -0400
Tweak location of the pmda check notrun
We need to place the notfun check to after setting the seq variable
commit 6372579317808e96ba4f0ab2886c500d2020801a
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Mon Mar 16 16:58:21 2015 -0400
Robustify testsuite in cases prereqs aren't installed
qa/511 - check for sar2pcp
qa/527 - check for perl deps
qa/537 - check for pcp perl deps
qa/660 - check for pmwebd installation
qa/711 - check for sar2pcp
qa/748 - check for mysql pmda installation
qa/763 - check for pcp perl deps
qa/769 - alter what we check for based on if pmmgr or pmwebd is installed
qa/769.out - make generic out file to symlink against
qa/769.out.1 - case where pmmgr and pmwebd are not installed
qa/769.out.2 - case were pmwebd is installed but not pmmgr
qa/769.out.3 - case were pmmgr is installed but not pmwebd
qa/769.out.4 - case where both are installed
qa/827 - check for snmp pmda installation
commit 26abc673c6371e60116eb6f809af76990e605e55
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Sat Mar 14 12:24:39 2015 -0400
Break src/pcp/ monitoring tools into their own sub package
Move pcp2graphite, atop, collectl, dmcache, free, iostat, numastat
and uptime into their own subpackage. Add symlinks for pcp2graphite,
atop, collectl and iostat for /usr/bin/pm* variants and backwards compat.
commit 26b4b34d822624ba4b09a56f7a2f84c60285012b
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Fri Mar 13 23:31:20 2015 -0400
move pcp2graphite under pcp-2graphite
src/GNUmakefile - remove pcp2graphite
src/pcp/GNUmakefile - added 2graphite subdir
renamed: pcp2graphite/{GNUmakefile,pcp2graphite.py} to
pcp/2graphite/{GNUmakefile,pcp-2collect.py}
commit 4dcc057bf472798d6b40256ba2c970eca729a928
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Fri Mar 13 22:22:39 2015 -0400
move pmcollectl under pcp-collectl
src/GNUmakefile - remove pmcollectl subdir
src/pcp/GNUmakefile - added collectl subdir
renamed: pmcollectl/{GNUmakefile,pmcollectl.py} to
pcp/collectl/{GNUmakefile,pcp-collectl.py}
commit 3c2810eda48ffef49638d9c465c023baf18db448
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Fri Mar 13 21:52:31 2015 -0400
move pmiostat under pcp-iostat
src/GNUmakefile - remove pmiostat subdir
src/pcp/GNUmakefile - added iostat subdir
rename: pmiostat/{GNUmakefile,pmiostat.py} to
pcp/atop/{GNUmakefile,pcp-iostat.py}
commit 7ea262c80adcaa39b3073e70f424969f1acea7e9
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Fri Mar 13 21:37:18 2015 -0400
move pmatop under pcp-atop
bulid/rpm/pcp.spec.in - adjust ordering of python and python3
src/GNUmakefile - removed pmatop subdir
src/pcp/GNUmakefile - add atop subdir
renamed: pmatop/{GNUmakefile,pmatop.py} to pcp/atop/{Gnumakefile,
pcp-atop.py}
commit 511b195bbe4cc21e102a5c34c500883c29b659cd
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Fri Mar 13 16:26:55 2015 -0400
Split python pmdas into their own sub packages
To simplify things, use a macro at the start of the spec file, which
is activated regardless of the version of python. Also make enable_python
explicitly python2.
commit 89b4a868275893be874fe01a94428bdb12cc81a0
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Fri Mar 13 10:57:52 2015 -0400
Separate Perl pmda's and pmda bindings
Break each perl pmda into their own subpackage
commit 7347927a67849a74b67d8b25fb58c033ee79042d
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Thu Feb 26 14:13:21 2015 -0500
PR1073 - pmlogger --PID lifetime tracking functionality
PR1073 detailed a request to run an instance of pmlogger, which
matched the lifetime of a specified PID. Monitor return of a kill(PID, 0)
style call, and exit once we get an ESRCH (no such process) error.
Updated doc pmlogger (1), and additional qa (947) added to the pmlogger
testing group.
commit fe589e5131230c07174726b9add24b00ed1c6421
Author: Lukas Berk <lberk@xxxxxxxxxx>
Date: Sun Feb 22 20:12:06 2015 -0500
Update pmdapapi papi_store function to actually loop through pmid's
src/pmdas/papi/papi.c - pmstore now loops through numpmid's instead
of immediately breaking after the first pmid
|