aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryn M. Reeves <bmr@redhat.com>2014-05-19 20:51:12 +0100
committerBryn M. Reeves <bmr@redhat.com>2014-06-05 15:59:22 -0400
commitfc97d862f449cbae13eda986bc060d0e3ff0a3c0 (patch)
tree18cc235e5eb10ac21c40f6a903c5f10ee1e6b803
parenta883e5aa5fe5d98646293279787b324ca90f2e12 (diff)
downloadsos-fc97d862f449cbae13eda986bc060d0e3ff0a3c0.tar.gz
Add oVirt Data Warehouse support
Add support for DWH to the oVirt plugin. Based on a patch for sos-2.0 by Sandro Bonazzola. Fixes Issue #236. Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
-rw-r--r--sos/plugins/ovirt.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/sos/plugins/ovirt.py b/sos/plugins/ovirt.py
index c6f89577..f4b7f1e2 100644
--- a/sos/plugins/ovirt.py
+++ b/sos/plugins/ovirt.py
@@ -35,8 +35,8 @@ class Ovirt(Plugin, RedHatPlugin):
pattern=r"""
^
/etc/
- (rhevm|ovirt-engine)/
- engine.conf
+ (rhevm|ovirt-engine|ovirt-engine-dwh)/
+ (engine.conf|ovirt-engine-dwhd.conf)
(\.d/.+.conf)?
$
"""
@@ -44,7 +44,7 @@ class Ovirt(Plugin, RedHatPlugin):
DEFAULT_SENSITIVE_KEYS = (
'ENGINE_DB_PASSWORD:ENGINE_PKI_TRUST_STORE_PASSWORD:'
- 'ENGINE_PKI_ENGINE_STORE_PASSWORD'
+ 'ENGINE_PKI_ENGINE_STORE_PASSWORD:DWH_DB_PASSWORD'
)
plugin_name = "ovirt"
@@ -76,7 +76,9 @@ class Ovirt(Plugin, RedHatPlugin):
self.add_copy_specs([
"/etc/ovirt-engine",
"/etc/rhevm",
+ "/etc/ovirt-engine-dwh",
"/var/log/ovirt-engine",
+ "/var/log/ovirt-engine-dwh",
"/var/log/rhevm",
"/etc/sysconfig/ovirt-engine",
"/usr/share/ovirt-engine/conf",