aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Kenigsberg <danken@redhat.com>2018-10-22 21:32:48 +0300
committerBryn M. Reeves <bmr@redhat.com>2019-03-18 18:49:07 +0000
commitffa2abe7010a709808119a212fcf971ba3235a04 (patch)
treec66219260094797f4f693d357136cf42f56666af
parent7ef1cf9ca6798891e04cfd9d5cc2f7d9093a48a6 (diff)
downloadsos-ffa2abe7010a709808119a212fcf971ba3235a04.tar.gz
[ovirt] collect `engine-config -d` when available
Newer versions of ovirt-engine can produce a short and readable diff from the "factory defaults". Resolves: #1460 Signed-off-by: Dan Kenigsberg <danken@redhat.com> Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/plugins/ovirt.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
index 9802ef52..1cd50583 100644
--- a/sos/plugins/ovirt.py
+++ b/sos/plugins/ovirt.py
@@ -87,8 +87,12 @@ class Ovirt(Plugin, RedHatPlugin):
self.add_forbidden_path('/var/log/ovirt-engine/dump')
self.add_cmd_output('ls -l /var/log/ovirt-engine/dump/')
- # Copy all engine tunables and domain information
- self.add_cmd_output("engine-config --all")
+ self.add_cmd_output([
+ # Copy all engine tunables and domain information
+ "engine-config --all",
+ # clearer diff from factory defaults (only on ovirt>=4.2.8)
+ "engine-config -d"
+ ])
# 3.x line uses engine-manage-domains, 4.x uses ovirt-aaa-jdbc-tool
manage_domains = 'engine-manage-domains'