Changes committed to git://oss.sgi.com/pcp/pcp.git dev
.gitignore | 1
build/rpm/GNUmakefile | 3 +-
build/rpm/pcp.spec.in | 24 +++++++++++++-------
configure | 30 ++++++++++++-------------
configure.in | 30 ++++++++++++-------------
man/man1/pmcd.1 | 14 +++++++++++
man/man1/pmdagfs2.1 | 2 -
man/man1/pmdagluster.1 | 4 +--
man/man1/pmstat.1 | 4 +--
qa/364.linux.2 | 1
qa/722.out | 4 ---
qa/861 | 53 +++++++++++++++++++++++++++++++++++++++++++++
qa/861.out | 8 ++++++
qa/group | 1
src/libpcp_pmcd/src/data.c | 3 +-
src/pmcd/src/config.c | 2 +
src/pmcd/src/pmcd.c | 8 +++++-
src/pmcd/src/pmcd.h | 3 ++
src/pmdas/GNUmakefile | 6 +++--
src/pmdas/linux/help | 1
src/pmdas/linux/pmda.c | 8 ++++++
src/pmdas/linux/root_linux | 1
src/pmdas/pmcd/src/pmcd.c | 10 +++++---
src/pmieconf/pmieconf.c | 2 -
src/pmieconf/rules.c | 2 -
src/pmieconf/rules.h | 8 +-----
src/pmlogger/.gitignore | 2 +
src/pmstat/pmstat.c | 6 ++---
28 files changed, 174 insertions(+), 67 deletions(-)
commit 3089154865904bf1ce7713cdbb68d5f3dd3915c9
Merge: e41d30a e2ffd39
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Aug 19 16:59:05 2013 +1000
Merge branch 'dev' of git://oss.sgi.com/kenj/pcp into dev
commit e41d30a9e771f5fa2373004761447229c70fda5c
Merge: bf6c31e e044527
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Aug 19 16:45:04 2013 +1000
Merge branch 'scox/dev' of ../pcpfans into dev
commit bf6c31e0552857537c7577b17926e901dfbe14ae
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Aug 19 16:44:47 2013 +1000
Update test qa/364 Linux output for hinv.nnode metric
commit fd1aba892c31a3f60eaff80ec848955ba51b4149
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Aug 19 14:13:02 2013 +1000
Add an option allowing custom pmcd.hostname settings
Following further discussions with fche and feedback from a
recent talk he gave, this commit adds further flexibility to
the pmcd.hostname metric allowing manual override. This may
suit for cloud-ey cases where local hostnames are not useful
or meaningful.
It would also suit for a need Hamish identified some time ago
with the SNMP PMDA.
A simple test qa/861 exercises the functionality.
commit 69d133024279ddb8da9cb5eba78370a0737df8bf
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Aug 19 13:05:25 2013 +1000
Resolve a potential pmcd sigsegv in ParseRestartAgents call
Add a check to ensure we do not attempt to use client data
structure that have been marked as no-longer-connected (as
a result, some fields may be NULL or otherwise invalid).
commit 2de9dc64e153a76c800ec5e8ccfc6f405abe06bd
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Aug 19 13:03:18 2013 +1000
Add hinv.nnode metric to pmdalinux, mirroring the original IRIX metric
commit a57069594445983947b0e924a3e4d58f13ff3f50
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Aug 19 13:01:42 2013 +1000
Update pmstat man page, add fallbacks for disk iops metrics
commit fac3da639ce309ce81935ff4a126c6c7b893276f
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Aug 19 12:54:59 2013 +1000
Update pmieconf to use correct PCP_SYSCONF_DIR path for interactive mode
commit 2d049e9d4482a9377241ab27be081c0cddf67196
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Aug 19 12:13:37 2013 +1000
Add gluster PMDA into the build, really this time
Due to an administrative oversight, pmdagluster has not
made it into the shipped packages as planned with last
release. Fix that.
This resolves Fedora bug #969348. Really this time.
commit 583047ff4fc5a2e3dc2d2b4d5a8d13e0d7201731
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Mon Aug 19 12:08:56 2013 +1000
Update name/description for pmdagluster/pmdagfs2 man pages
These two man pages are not being installed correctly due
to some unusal formatting in the NAME section.
"rpm -ql pcp | grep pmdag" gives files like ...
/usr/share/man/man1/fBpmdaglusterfR.1.gz
/usr/share/man/man1/fBpmdagfs2fR.1.gz
Making it consistent with the other man pages resolves it.
commit e2ffd3924abda5b163d4ac45eac00395c0e707d1
Merge: 186bfe7 39a1dd3
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon Aug 12 13:48:41 2013 +1000
Merge branch 'dev' of git://oss.sgi.com/pcp/pcp into dev
Conflicts:
build/rpm/pcp.spec.in
Nathan and I made an almost identical change in parallel ... 8^)>
commit 186bfe76f7b23108ebc10bd1f0a3278225e64e81
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon Aug 12 08:33:09 2013 +1000
git ignore - minor additions
commit 4a11077d181c057f07176dc2e5b097dd3041d1d6
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon Aug 12 06:42:18 2013 +1000
Revert "Revert "Make infiniband pmda optional in rpm packaging""
Flip-flop again libib packages are only available for fedora 18
and rhel/centos 6 ... so this _has_ to be optional
This reverts commit 1705db9231cf0ed9f51b5ec792fdb75b7c9f0871.
commit 1705db9231cf0ed9f51b5ec792fdb75b7c9f0871
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Mon Aug 12 06:27:14 2013 +1000
Revert "Make infiniband pmda optional in rpm packaging"
This was a mistake ... cannot make it optional in the dpkg packages,
so leave it alone for rpm packaging.
This reverts commit f849dbd97f648a4f613ea7e45f42c2f3c9c08c3e.
commit f849dbd97f648a4f613ea7e45f42c2f3c9c08c3e
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Sun Aug 11 20:05:23 2013 +1000
Make infiniband pmda optional in rpm packaging
If I cannot test the infiniband PMDA, then I don't want to have to
install additional infiniband devel packages just to build PCP.
This commit fixes a logic issue in configure.in related to the
infiniband PMDA, then rpm packaging changes.
commit e04452791156fb3b133133718625d6df6a6c487e
Author: Stan Cox <scox@xxxxxxxxxx>
Date: Fri Aug 9 16:06:06 2013 -0400
Match 722.out to "Decrease screen real estate used for display"
commit d8c8e683fa25d93abf015a0a515e045a32c220d9
Merge: 2a6808c 7b5a5a0
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Fri Aug 9 07:22:20 2013 +1000
Merge branch 'dev' of git://oss.sgi.com/pcp/pcp into dev
|