From 1ddad7799d05346c5cf7689c0da2da6383b90d7c Mon Sep 17 00:00:00 2001
From: Neependra Khare <nkhare@redhat.com>
Date: Tue, 27 Jan 2015 15:54:23 +0000
Subject: [PATCH 85/93] [etcd] split etcd functionality from kubernetes into
 new plugin

Signed-off-by: Neependra Khare <nkhare@redhat.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
 sos/plugins/etcd.py       | 36 ++++++++++++++++++++++++++++++++++++
 sos/plugins/kubernetes.py |  8 --------
 2 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 sos/plugins/etcd.py

diff --git a/sos/plugins/etcd.py b/sos/plugins/etcd.py
new file mode 100644
index 0000000..69edca0
--- /dev/null
+++ b/sos/plugins/etcd.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2015 Red Hat, Inc. Neependra Khare <nkhare@redhat.com>
+# Copyright (C) 2015 Red Hat, Inc. Bryn M. Reeves <bmr@redhat.com>
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+from sos.plugins import Plugin, RedHatPlugin
+
+
+class etcd(Plugin, RedHatPlugin):
+
+    """etcd plugin
+    """
+
+    def setup(self):
+        self.add_copy_spec("/etc/etcd")
+
+        self.add_cmd_output("curl http://localhost:4001/version")
+        self.add_cmd_output("curl http://localhost:4001/v2/members")
+        self.add_cmd_output("curl http://localhost:4001/v2/stats/leader")
+        self.add_cmd_output("curl http://localhost:4001/v2/stats/self")
+        self.add_cmd_output("curl http://localhost:4001/v2/stats/store")
+        self.add_cmd_output("ls -lR /var/lib/etcd/")
+
+
+# vim: et ts=5 sw=4
diff --git a/sos/plugins/kubernetes.py b/sos/plugins/kubernetes.py
index af3f3a6..289d784 100644
--- a/sos/plugins/kubernetes.py
+++ b/sos/plugins/kubernetes.py
@@ -24,7 +24,6 @@ class kubernetes(Plugin, RedHatPlugin):
 
     def setup(self):
         self.add_copy_spec("/etc/kubernetes")
-        self.add_copy_spec("/etc/etcd")
         self.add_copy_spec("/var/run/flannel")
 
         # Kubernetes master info
@@ -35,12 +34,5 @@ class kubernetes(Plugin, RedHatPlugin):
         self.add_cmd_output("kubectl get -o json events")
         self.add_cmd_output("journalctl -r -u kubelet")
 
-        # etcd
-        self.add_cmd_output("curl http://127.0.0.1:4001/version")
-        self.add_cmd_output("curl http://127.0.0.1:4001/v2/members")
-        self.add_cmd_output("curl http://127.0.0.1:4001/v2/stats/leader")
-        self.add_cmd_output("curl http://127.0.0.1:4001/v2/stats/self")
-        self.add_cmd_output("curl http://127.0.0.1:4001/v2/stats/store")
-
 
 # vim: et ts=5 sw=4
-- 
1.9.3