Changes committed to git://git.pcp.io/pcp.git master
Marko Myllynen (5):
pmrep: rename a variable
pmrep: rename output file param
pmrep: rename a method
pmrep: support -F for csv/stdout
pmrep: show metrics counts
Nathan Scott (1):
qa: add 1069 test case for pmrep csv output to file mode
qa/1069 | 7 +-
qa/1069.out | 2
src/pmrep/pmrep.1 | 10 +--
src/pmrep/pmrep.py | 162 +++++++++++++++++++++++++++++------------------------
4 files changed, 105 insertions(+), 76 deletions(-)
commit 30a2c038a3f43a8e1a98dd7b958edd6b3d7fc201
Author: Nathan Scott <nathans@xxxxxxxxxx>
Date: Fri Dec 18 12:33:27 2015 +1100
qa: add 1069 test case for pmrep csv output to file mode
Verify that the pmrep -F mode works by adding another test
case to qa/1069. This picked up a failure on python3...
> Traceback (most recent call last):
> File "/bin/pmrep", line 1357, in <module>
> P.execute()
> File "/bin/pmrep", line 825, in execute
> self.write_header()
> File "/bin/pmrep", line 1101, in write_header
> self.writer.write("Time")
> TypeError: 'str' does not support the buffer interface
Resolved that by opening the output file in text mode, not
binary. This uncovered another python3 issue, wherein the
created output file was empty - resolved by adding a flush
call to the finalize method. Now passes on both python2 &
python3.
commit 0f27b8551f42da62509ba428dffe6ca17f55ff42
Author: Marko Myllynen <myllynen@xxxxxxxxxx>
Date: Fri Dec 18 11:21:50 2015 +1100
pmrep: show metrics counts
Show metrics counts as part of the extended header and always
with archive/zabbix output.
(self.pmids is the correct one to use, not self.metrics for this.)
commit 19237bb9dcf97102d382fd2075015a038eea79fa
Author: Marko Myllynen <myllynen@xxxxxxxxxx>
Date: Fri Dec 18 11:19:47 2015 +1100
pmrep: support -F for csv/stdout
Allow optionally using -F with csv/stdout (so it'll be same as the shell
redirect this far), wrap printing to possibly allow future verbose/quiet
option enhancements.
commit eb9eeabd159aeb7e9a3e1fa7786d5a521b16a87b
Author: Marko Myllynen <myllynen@xxxxxxxxxx>
Date: Fri Dec 18 11:13:17 2015 +1100
pmrep: rename a method
Use more descriptive name for the define_format method.
commit 17898c7f3c8da6695139eb5c23c89bda52f74a46
Author: Marko Myllynen <myllynen@xxxxxxxxxx>
Date: Fri Dec 18 11:12:07 2015 +1100
pmrep: rename output file param
Rename output archive to output file in preparation for next
patches. Minor man page / output header tweaks.
commit 47d1c67f8520f592d0816046394d24f54240174b
Author: Marko Myllynen <myllynen@xxxxxxxxxx>
Date: Fri Dec 18 11:01:30 2015 +1100
pmrep: rename a variable
Use a more descriptive name for the pmi handle in pmrep.
No functional change.
|