aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Rich <erich@redhat.com>2014-01-06 16:17:50 -0500
committerPep Turro Mauri <pep@redhat.com>2014-06-26 22:18:45 +0200
commitc9f909deb66100d277d0741c8162a417f2e58c46 (patch)
treeebe62a608ef5805c3acc056374b3a4c1fb558a7a
parent886b1f31b751f2167090c154533af4433fffb617 (diff)
downloadsos-c9f909deb66100d277d0741c8162a417f2e58c46.tar.gz
[openshift] Adding 2.0 files and commands.
-rw-r--r--sos/plugins/openshift.py23
1 files changed, 13 insertions, 10 deletions
diff --git a/sos/plugins/openshift.py b/sos/plugins/openshift.py
index ecbbfc68..ee272e62 100644
--- a/sos/plugins/openshift.py
+++ b/sos/plugins/openshift.py
@@ -26,26 +26,27 @@ class Openshift(Plugin, RedHatPlugin):
self.add_copy_specs([
"/etc/openshift-enterprise-version",
"/etc/openshift/",
+ "/var/log/openshift/",
"/etc/dhcp/dhclient-*"
])
+ self.add_cmd_output("oo-diagnostics")
+
if self.option_enabled("broker"):
self.add_copy_specs([
"/var/log/activemq",
"/var/log/mongodb",
- "/var/log/openshift",
- "/var/www/openshift/broker/log",
- "/var/www/openshift/broker/httpd/logs/",
- "/var/www/openshift/console/log",
- "/var/www/openshift/console/httpd/logs",
- "/var/log/openshift/user_action.log"
+ "/var/log/mcollective-client.log",
+ "/var/log/ruby193-mcollective-client.log",
+ "/var/log/openshift/broker/",
+ "/var/log/openshift/console/"
])
self.add_cmd_outputs([
- "oo-accpet-broker -v",
+ "oo-accept-broker -v",
"oo-admin-chk -v",
"mco ping",
- "gem list --local"
+ "oo-mco ping",
])
runat = '/var/www/openshift/broker/'
self.add_cmd_output("bundle --local", runat)
@@ -54,12 +55,14 @@ class Openshift(Plugin, RedHatPlugin):
if self.option_enabled("node"):
self.add_copy_specs([
"/var/log/openshift/node",
- "/cgroup/all/openshift",
+ "/cgroup/*/openshift/",
"/var/log/mcollective.log",
+ "/opt/rh/ruby193/root/etc/mcollective/",
"/var/log/openshift-gears-async-start.log",
- "/var/log/httpd/error_log"
+ "/var/log/httpd/"
])
+
self.add_cmd_outputs([
"oo-accept-node -v",
"oo-admin-ctl-gears list",