Mixed bag here ... pulled Nathan's latest round of emergency bug fixing
changes and some small changes from me for the weblog PMDA and the rc
scripts for SuSE platforms.
Changes committed to git://oss.sgi.com/kenj/pcp.git dev
CHANGELOG | 20 +++++++
VERSION.pcp | 6 +-
build/rpm/pcp.spec.in | 7 +-
debian/GNUmakefile | 10 ++-
debian/changelog | 14 +++--
debian/pcp.conffiles | 3 +
debian/pcp.lintian | 6 ++
debian/rules | 9 ---
debian/source.lintian-overrides | 2
man/man3/pmdaevent.3 | 10 +--
src/pmcd/rc_pcp | 2
src/pmdas/logger/event.c | 49 ++++++++++++-----
src/pmdas/weblog/server.sh | 112 +++++++++++++++++++++-------------------
src/pmie/pmie_check.sh | 10 ++-
src/pmie/pmie_daily.sh | 4 +
src/pmie/rc_pmie | 2
src/pmlogctl/pmlogger_check.sh | 12 ++--
src/pmlogctl/pmlogger_daily.sh | 4 +
src/pmlogsummary/pmlogsummary.c | 2
src/pmproxy/rc_pmproxy | 2
20 files changed, 181 insertions(+), 105 deletions(-)
commit 45510417f4cb72e91fc247b414d09fd89c4bf463
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Thu Jul 7 07:05:42 2011 +1000
pmdaevent.3 - minor troff tweak for ... at start of line
commit a6a83eb06ce656aaaa2d5be896541f8fa80b2581
Merge: e0a44e5 22401bc
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Thu Jul 7 07:02:55 2011 +1000
Merge branch 'dev' of git://oss.sgi.com/pcp/pcp into dev
Conflicts:
src/pmdas/logger/event.c
Nathan and I had applied the same fix, differing only in whitespace.
commit 22401bcfb62221aaba2f7dc558cfed9e5c31f903
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Thu Jul 7 05:31:25 2011 +1000
Rollup to 3.5.5 to fix more pmie/pmlogger_check/daily script /bin/pwd
fallout.
commit 9825cf4591112951504872ca5707ef0112ab1f21
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jul 6 21:23:36 2011 +1000
Rework the /bin/pwd -P workaround, not good for pmie_check.
The use of eval was interacting poorly with the pmie_check
script, although fine for pmlogger_check. Use a simpler test
for -P validity which appears to do the right thing on all of
the supported platforms checked.
commit 8b74968eaa1661a68d5f951777c9a834740dc6fe
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jul 6 21:21:41 2011 +1000
Rework Kens deb packaging fix for config files.
lintian didn't like the previous way, and turns out theres
a simpler way - just list the extra conf files in a special
debian/pcp.conffiles and the existing scripts do the right
thing.
Added lintian overrides for this and other non-issues, but
left the remaining "real" ones still to be worked through.
commit d29c61815bf06b78fb2a8adc04d5b3914d8c5387
Merge: 4502cb2 ab298d2
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jul 6 15:10:44 2011 +1000
Merge branch 'dev' of git://oss.sgi.com/pcp/pcp into dev
commit 4502cb2dee4fcfd05dba7404ce65f991cae34cf6
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jul 6 15:10:20 2011 +1000
Fix pmdalogger compiler warning in 64-bit builds.
commit ab298d29a51dc7d5cbf03c374c9e3f33afda9910
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jul 6 13:55:01 2011 +1000
Fix /bin/pwd with -P for those platforms with no support for it.
Commit cddf082ed4711273305880c7b2cb2add4ea60a1e has introduced an
unfortunate side-effect for some platforms where /bin/pwd doesn't
support -P. On these platforms (as recent as RHEL5) the command
prints a warning - /bin/pwd: ignoring non-option arguments - but
still runs to completion.
Workaround for this is to toss stderr and just go with the result
from stdout. Without this change, pmie_check from cron every few
minutes sends mail with the above warning, once per pmlogger.
commit e3df76a394c03c065516e34ac9f70f82d8ec598f
Merge: c8178d8 c96136d
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jul 6 13:52:41 2011 +1000
Merge branch 'dev' of git://oss.sgi.com/pcp/pcp into dev
commit c8178d8cc932b17378cc93a6c9d8a1e89e55a528
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jul 6 13:52:10 2011 +1000
Fix /bin/pwd with -P for those platforms with no support for it.
Commit cddf082ed4711273305880c7b2cb2add4ea60a1e has introduced an
unfortunate side-effect for some platforms where /bin/pwd doesn't
support -P. On these platforms (as recent as RHEL5) the command
prints a warning - /bin/pwd: ignoring non-option arguments - but
still runs to completion.
Workaround for this is to toss stderr and just go with the result
from stdout. Without this change, pmie_check from cron every few
minutes sends mail with the above warning, once per pmlogger.
commit c96136df5ab0da1c02128b182db12d13337b3753
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jul 6 11:33:36 2011 +1000
Bump pcp version to 3.5.3 for latest release.
commit c654a722d5c47b8f13d3e905215a70ac6e0cbb52
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Jul 6 11:10:00 2011 +1000
Use direct event pointer in pmdalogger last event tracking.
Instead of using pointer-to-a-pointer, easier to use a direct
pointer. Makes it a bit simpler to follow the code and the
TAILQ macros from queue.h can be used (more).
Also added a diagnostic routine such that we only print the
first few characters of event parameter string, to make the
agent log file easier to follow.
commit e0a44e538c8cc7332b7307da895d00aaf22293b1
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Wed Jul 6 07:11:35 2011 +1000
rc scripts - SuSE fix
For SuSE (or at least for openSUSE 11.4), network is not started
by default for runlevels 2 and 4, and syslog is not started by default
for runlevel 4. Since we require these to be running, don't start
pmcd or pmie or pmproxy by default for runlevels 2 and 4.
commit 083fcc723d60a71dbbb1ce505abfe1546e7b90fe
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue Jul 5 21:04:43 2011 +1000
pmda weblog - fix server.sh for Apache2
QA 703 and 706 were failing with a more modern apache2 installation as
the only http server.
Fixed a number of problems with the server.sh script.
commit 87a57c8f0d48b5f32dc4fc4916b6067f5c597d88
Author: Ken McDonell <kenj@xxxxxxxxxxxxxxxx>
Date: Tue Jul 5 16:05:31 2011 +1000
logger pmda, pmlogsummary - fix compilation warnings
|