Sandro Bonazzola has uploaded a new change for review. Change subject: sos: add support for sos 3.2 ......................................................................
sos: add support for sos 3.2 sos 3.2 changed command line moving all-logs out of logs plugin. Change-Id: I99d43a215e1940896e7379c1eb2651e095583ad7 Signed-off-by: Sandro Bonazzola <[email protected]> --- M src/__main__.py 1 file changed, 9 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector refs/changes/59/35159/1 diff --git a/src/__main__.py b/src/__main__.py index 1d8a9df..72d8142 100755 --- a/src/__main__.py +++ b/src/__main__.py @@ -689,7 +689,10 @@ cmd = """%(ssh_cmd)s " VERSION=`/bin/rpm -q --qf '[%%{{VERSION}}]' sos | /bin/sed 's/\.//'`; -if [ "$VERSION" -ge "30" ]; then +if [ "$VERSION" -ge "32" ]; then + /usr/sbin/sosreport {option} --batch --all-logs \ + -o logs,%(reports)s +elif [ "$VERSION" -ge "30" ]; then /usr/sbin/sosreport {option} --batch -k logs.all_logs=True \ -o logs,%(reports)s elif [ "$VERSION" -ge "22" ]; then @@ -855,13 +858,14 @@ if self.configuration.get("upload"): opts.append("--upload=%s" % self.configuration.get("upload")) - - if sos.__version__.replace('.', '') < '30': + sos_version = sos.__version__.replace('.', '') + if sos_version < '30': opts.append('--report') opts.append("-k general.all_logs=True") - else: + elif sos_version < '32': opts.append("-k logs.all_logs=True") - + else: + opts.append("--all-logs") return " ".join(opts) def sosreport(self): -- To view, visit http://gerrit.ovirt.org/35159 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I99d43a215e1940896e7379c1eb2651e095583ad7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-log-collector Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
