Sandro Bonazzola has uploaded a new change for review. Change subject: sos: require and support sos 3.1.1 ......................................................................
sos: require and support sos 3.1.1 ovirt pluing has been merged in upstream sos package. Rrequiring an updated version including ovirt plugin. Bug-Url: https://bugzilla.redhat.com/1037663 Change-Id: I74b1d24cff897d6cc393ee68edfe0d78030877c5 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> --- M ovirt-log-collector.spec.in M src/__main__.py 2 files changed, 35 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector refs/changes/09/27909/1 diff --git a/ovirt-log-collector.spec.in b/ovirt-log-collector.spec.in index 3ef0f6c..10e0b62 100644 --- a/ovirt-log-collector.spec.in +++ b/ovirt-log-collector.spec.in @@ -37,7 +37,7 @@ Requires: openssh-clients %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -Requires: sos >= 3.1 +Requires: sos >= 3.1.1 %else Requires: sos < 3 %endif diff --git a/src/__main__.py b/src/__main__.py index c1a4d86..db155d2 100755 --- a/src/__main__.py +++ b/src/__main__.py @@ -775,6 +775,8 @@ self._engine_plugin = 'engine' if sos.__version__.replace('.', '') >= '30': self._engine_plugin = 'ovirt-engine' + if sos.__version__.replace('.', '') >= '311': + self._engine_plugin = 'ovirt' def prep(self): super(ENGINEData, self).prep() @@ -807,14 +809,32 @@ self._engine_plugin: 'sensitive_keys', 'ovirt_engine_dwh': 'dwh_sensitive_keys', } - for plugin in sensitive_keys: - if self.configuration.get(sensitive_keys[plugin]): - opts.append( - '-k {plugin}.sensitive_keys={keys}'.format( - plugin=plugin, - keys=self.configuration.get(sensitive_keys[plugin]), + if sos.__version__.replace('.', '') < '30': + # In sos 3.0 dwh plugin doesn't exist + # In sos 3.1.1 it has been merged in ovirt plugin + for plugin in sensitive_keys: + if self.configuration.get(sensitive_keys[plugin]): + opts.append( + '-k {plugin}.sensitive_keys={keys}'.format( + plugin=plugin, + keys=self.configuration.get( + sensitive_keys[plugin] + ), + ) ) + else: + sensitive_keys_opt = '' + for plugin in sensitive_keys: + if self.configuration.get(sensitive_keys[plugin]): + sensitive_keys_opt += self.configuration.get( + sensitive_keys[plugin] + ) + opts.append( + '-k {plugin}.sensitive_keys={keys}'.format( + plugin=self._engine_plugin, + keys=sensitive_keys_opt, ) + ) if self.configuration.get("ticket_number"): opts.append( @@ -848,11 +868,17 @@ "kernel", "apache", "memory", - "ovirt_engine_dwh", - "ovirt_engine_reports", )) + if sos.__version__.replace('.', '') > '30': self.configuration['reports'] += ',logs' + else: + # In sos 3.0 the following are not available + # In sos 3.1.1 they've been merged in ovirt plugin. + self.configuration['reports'] += ( + ',ovirt_engine_dwh' + ',ovirt_engine_reports' + ) self.configuration["sos_options"] = self.build_options() self.caller.call( "sosreport --batch --build \ -- To view, visit http://gerrit.ovirt.org/27909 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74b1d24cff897d6cc393ee68edfe0d78030877c5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-log-collector Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
