From 2e1f199421e00cc30963f3fb022c5c173b18d509 Mon Sep 17 00:00:00 2001 From: Pep Turro Mauri Date: Tue, 8 Jul 2014 13:37:48 +0200 Subject: [openshift] Don't collect all of /etc/openshift MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reduce glob based collection and aim at more specific paths. Signed-off-by: Pep Turró Mauri --- sos/plugins/openshift.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sos/plugins/openshift.py b/sos/plugins/openshift.py index 56ffb19a..b4d6efa9 100644 --- a/sos/plugins/openshift.py +++ b/sos/plugins/openshift.py @@ -37,15 +37,18 @@ class Openshift(Plugin, RedHatPlugin): def setup(self): self.add_copy_specs([ - "/etc/openshift-enterprise-*", + "/etc/openshift-enterprise-release", "/var/log/openshift/", - "/etc/openshift/" + "/etc/openshift/*.conf", + "/etc/openshift/upgrade", ]) self.add_cmd_output("oo-diagnostics -v") if self.is_broker(): self.add_copy_specs([ + "/etc/openshift/quickstarts.json", + "/etc/openshift/plugins.d/*.conf", "/var/www/openshift/broker/httpd/conf.d/*.conf", "/var/www/openshift/console/httpd/conf.d/*.conf", ]) @@ -58,6 +61,11 @@ class Openshift(Plugin, RedHatPlugin): if self.is_node(): self.add_copy_specs([ + "/etc/openshift/node-plugins.d/*.conf", + "/etc/openshift/iptables.*.rules", + "/etc/openshift/web-proxy-config.json", + "/etc/openshift/env", + "/etc/openshift/cart.conf.d", "/opt/%s/%s/root/etc/mcollective/" % (self.vendor, self.ruby), "/var/log/httpd/openshift_log", "/var/log/mcollective.log", @@ -87,8 +95,4 @@ class Openshift(Plugin, RedHatPlugin): r"(SESSION_SECRET=)(.*)", r"\1*******") - self.do_file_sub('/etc/openshift/htpasswd', - r"(.*:)(.*)", - r"\1********") - # vim: et ts=4 sw=4 -- cgit