Sandro Bonazzola has uploaded a new change for review. Change subject: sos: adapt to engine sosreport to sos 3.2 ......................................................................
sos: adapt to engine sosreport to sos 3.2 SOS plugins have been refactored between sos 2 and sos 3, enabling additional plugins for sos > 3 Change-Id: I6a875df5d3cd7f8946092fe9b0976b6541f9a1d4 Bug-Url: https://bugzilla.redhat.com/1225117 Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> (cherry picked from commit 82e9694d03992d35b62f5ba91c28086ad6fca936) --- M src/__main__.py 1 file changed, 16 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-log-collector refs/changes/10/41510/1 diff --git a/src/__main__.py b/src/__main__.py index e6ec4ff..cd2913c 100755 --- a/src/__main__.py +++ b/src/__main__.py @@ -789,6 +789,7 @@ class ENGINEData(CollectorBase): def __init__(self, hostname, configuration=None, **kwargs): super(ENGINEData, self).__init__(hostname, configuration) + self.sos_version = sos.__version__.replace('.', '') self._plugins = self.caller.call('sosreport --list-plugins') if 'ovirt.sensitive_keys' in self._plugins: self._engine_plugin = 'ovirt' @@ -860,18 +861,17 @@ if self.configuration.get("upload"): opts.append("--upload=%s" % self.configuration.get("upload")) - sos_version = sos.__version__.replace('.', '') - if sos_version < '30': + if self.sos_version < '30': opts.append('--report') opts.append("-k general.all_logs=True") - elif sos_version < '32': + elif self.sos_version < '32': opts.append("-k logs.all_logs=True") else: opts.append("--all-logs") return " ".join(opts) def sosreport(self): - self.configuration["reports"] = ",".join(( + sos_plugins = [ self._engine_plugin, "rpm", "libvirt", @@ -886,7 +886,18 @@ "kernel", "apache", "memory", - )) + ] + if self.sos_version > '30': + sos_plugins.extend([ + "block", + "java", + "lvm2", + "md", + "pci", + "processor", + "scsi", + ]) + self.configuration["reports"] = ",".join(sos_plugins) if 'logs.all_logs' in self._plugins: self.configuration['reports'] += ',logs' if 'ovirt_engine_dwh.sensitive_keys' in self._plugins: -- To view, visit https://gerrit.ovirt.org/41510 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6a875df5d3cd7f8946092fe9b0976b6541f9a1d4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-log-collector Gerrit-Branch: ovirt-log-collector-3.5 Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
