Changes committed to git://git.pcp.io/pcp.git master
Nathan Scott (5):
pmrep: additional QA, man page updates, small code tweaks
pmrep: fix use of list next operator in python3
pmrep: use a local version of the zbxsend python code
python: improve exception handling in several python tools
zbxpcp: additional porting work for python3, test fix
Marko Myllynen (2):
docs: small improvements to zbxpcp(3) man page
build: sync deb and rpm zabbix-agent package descriptions
build/rpm/fedora.spec | 6 -
build/rpm/pcp.spec.in | 6 -
qa/1068 | 88 +++++++++++++++++
qa/1068.out | 52 ++++++++--
qa/1069 | 73 ++++++++++++++
qa/1069.out | 73 ++++++++++++++
qa/group | 2
src/pcp/iostat/pcp-iostat.py | 2
src/pcp2graphite/pcp2graphite.py | 10 -
src/pmrep/TODO | 29 +++++
src/pmrep/pmrep.1 | 179 ++++++++++++++++++-----------------
src/pmrep/pmrep.py | 199 ++++++++++++++++++++++++---------------
src/zabbix-agent/src/zbxpcp.3 | 3
13 files changed, 544 insertions(+), 178 deletions(-)
commit 9701e1f3dc95a5039fdce42d29a0e8b05c897dd0
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Dec 2 13:04:50 2015 +1100
zbxpcp: additional porting work for python3, test fix
Handle subtle differences in test output between python
versions, ensure socket send buffer has type 'bytes'.
commit 83d81e6e9608164c622ed4116807192e792f8ece
Author: Marko Myllynen <myllynen@xxxxxxxxxx>
Date: Wed Dec 2 11:30:30 2015 +1100
build: sync deb and rpm zabbix-agent package descriptions
commit 037ff1fcb187daa8f45e50b5bd9a1f94366ae512
Author: Marko Myllynen <myllynen@xxxxxxxxxx>
Date: Wed Dec 2 11:28:12 2015 +1100
docs: small improvements to zbxpcp(3) man page
commit c46474072cf4f251ea413689d1ef9808e433d844
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Dec 2 11:26:32 2015 +1100
python: improve exception handling in several python tools
commit f76c9fa2ecb37fb07f46bae36465ace8dfc95e23
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Dec 2 11:24:13 2015 +1100
pmrep: use a local version of the zbxsend python code
Its small, simple and otherwise not easily available. Add
in the changes required to make it work on python3, which
Marko has also sent upstream (without success so far).
commit 209e2a6c7b5f52aebe894838194b46faf8588213
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Dec 2 10:09:12 2015 +1100
pmrep: fix use of list next operator in python3
Fix use of list next operator on arguments list, causing:
'list_iterator' object has no attribute 'next'
Traceback (most recent call last):
File "/usr/bin/pmrep", line 1231, in <module>
P = PMReporter()
File "/usr/bin/pmrep", line 85, in __init__
self.config = self.set_config_file()
File "/usr/bin/pmrep", line 148, in set_config_file
config = args.next()
AttributeError: 'list_iterator' object has no attribute 'next'
(picked up by new pmrep QA tests using PCP_PYTHON_PROG, win).
commit 3494228690a59a6425187e12f6577e736574d29d
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Wed Dec 2 10:05:02 2015 +1100
pmrep: additional QA, man page updates, small code tweaks
Adds QA tests 1068 and 1069 for exercising various pmrep modes
of operation. Updated the man page for consistency with other
PCP man pages (new sentences on a new line, etc). Small code
tidyups - move TODO notes into a separate file, switch to pcp
interpreter convention for using PCP_PYTHON_PROG interpreter,
drop compat code for old PCP versions now that its merged, and
use the symbolic pmDebug macros.
|