|
 |
0cd6dc |
From fd42f7d34c58aa66601eb9bd7aacc86556003918 Mon Sep 17 00:00:00 2001
|
|
|
0cd6dc |
From: Neependra Khare <nkhare@redhat.com>
|
|
|
0cd6dc |
Date: Tue, 27 Jan 2015 15:58:32 +0000
|
|
|
0cd6dc |
Subject: [PATCH 86/93] [kubernetes] add services and pod logs collection
|
|
|
0cd6dc |
|
|
|
0cd6dc |
Signed-off-by: Neependra Khare <nkhare@redhat.com>
|
|
|
0cd6dc |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
0cd6dc |
---
|
|
|
0cd6dc |
sos/plugins/kubernetes.py | 12 ++++++++++++
|
|
|
0cd6dc |
1 file changed, 12 insertions(+)
|
|
|
0cd6dc |
|
|
|
0cd6dc |
diff --git a/sos/plugins/kubernetes.py b/sos/plugins/kubernetes.py
|
|
|
0cd6dc |
index 289d784..9c2df5e 100644
|
|
|
0cd6dc |
--- a/sos/plugins/kubernetes.py
|
|
|
0cd6dc |
+++ b/sos/plugins/kubernetes.py
|
|
|
0cd6dc |
@@ -22,6 +22,8 @@ class kubernetes(Plugin, RedHatPlugin):
|
|
|
0cd6dc |
"""Kubernetes plugin
|
|
|
0cd6dc |
"""
|
|
|
0cd6dc |
|
|
|
0cd6dc |
+ option_list = [("podslog", "capture logs for pods", 'slow', False)]
|
|
|
0cd6dc |
+
|
|
|
0cd6dc |
def setup(self):
|
|
|
0cd6dc |
self.add_copy_spec("/etc/kubernetes")
|
|
|
0cd6dc |
self.add_copy_spec("/var/run/flannel")
|
|
|
0cd6dc |
@@ -30,9 +32,19 @@ class kubernetes(Plugin, RedHatPlugin):
|
|
|
0cd6dc |
self.add_cmd_output("kubectl version")
|
|
|
0cd6dc |
self.add_cmd_output("kubectl get -o json pods")
|
|
|
0cd6dc |
self.add_cmd_output("kubectl get -o json minions")
|
|
|
0cd6dc |
+ self.add_cmd_output("kubectl get -o json services")
|
|
|
0cd6dc |
self.add_cmd_output("kubectl get -o json replicationController")
|
|
|
0cd6dc |
self.add_cmd_output("kubectl get -o json events")
|
|
|
0cd6dc |
self.add_cmd_output("journalctl -r -u kubelet")
|
|
|
0cd6dc |
|
|
|
0cd6dc |
+ if self.get_option('podslog'):
|
|
|
0cd6dc |
+ result = self.get_command_output("kubectl get pods")
|
|
|
0cd6dc |
+ if result['status'] == 0:
|
|
|
0cd6dc |
+ for line in result['output'].splitlines()[1:]:
|
|
|
0cd6dc |
+ pod_name = line.split(" ")[0]
|
|
|
0cd6dc |
+ self.add_cmd_output([
|
|
|
0cd6dc |
+ "{0} log {1}".format("kubectl", pod_name)
|
|
|
0cd6dc |
+ ])
|
|
|
0cd6dc |
+
|
|
|
0cd6dc |
|
|
|
0cd6dc |
# vim: et ts=5 sw=4
|
|
|
0cd6dc |
--
|
|
|
0cd6dc |
1.9.3
|
|
|
0cd6dc |
|