From 3aabd18b2666dbbeb86871ac4b9f025e468d5818 Mon Sep 17 00:00:00 2001
From: Christy Perez <christy@linux.vnet.ibm.com>
Date: Tue, 16 Dec 2014 12:46:27 +0000
Subject: [PATCH] [kimchi] add new plugin

This plugin gathers kimchi logs and configuration files.

Kimchi is an HTML5-based virtualization-management platform
For more information, please visit:
https://github.com/kimchi-project/kimchi/wiki

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
 sos/plugins/kimchi.py | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 sos/plugins/kimchi.py

diff --git a/sos/plugins/kimchi.py b/sos/plugins/kimchi.py
new file mode 100644
index 0000000..613b2c9
--- /dev/null
+++ b/sos/plugins/kimchi.py
@@ -0,0 +1,40 @@
+# Copyright IBM, Corp. 2014, Christy Perez <christy@linux.vnet.ibm.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, UbuntuPlugin, DebianPlugin
+
+
+class Kimchi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
+    """kimchi-related information
+    """
+
+    plugin_name = 'kimchi'
+    packages = ('kimchi',)
+
+    def setup(self):
+        log_limit = self.get_option('log_size')
+        if not self.get_option('all_logs'):
+            self.add_copy_spec_limit('/var/log/kimchi/*.log',
+                                     sizelimit=log_limit)
+            self.add_copy_spec_limit('/etc/kimchi/kimchi*',
+                                     sizelimit=log_limit)
+            self.add_copy_spec_limit('/etc/kimchi/distros.d/*.json',
+                                     sizelimit=log_limit)
+        else:
+            self.add_copy_spec('/var/log/kimchi/')
+            self.add_copy_spec('/etc/kimchi/')
+
+# vim: expandtab tabstop=4 shiftwidth=4
-- 
1.8.3.1

From cb9805d129827178df5b32fc681f629d4f40ac6e Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Tue, 10 Feb 2015 19:09:26 +0000
Subject: [PATCH] [kimchi] fix collection of /etc/kimchi

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
 sos/plugins/kimchi.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sos/plugins/kimchi.py b/sos/plugins/kimchi.py
index 613b2c9..efb469e 100644
--- a/sos/plugins/kimchi.py
+++ b/sos/plugins/kimchi.py
@@ -26,6 +26,7 @@ class Kimchi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
 
     def setup(self):
         log_limit = self.get_option('log_size')
+        self.add_copy_spec('/etc/kimchi/')
         if not self.get_option('all_logs'):
             self.add_copy_spec_limit('/var/log/kimchi/*.log',
                                      sizelimit=log_limit)
@@ -35,6 +36,5 @@ class Kimchi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
                                      sizelimit=log_limit)
         else:
             self.add_copy_spec('/var/log/kimchi/')
-            self.add_copy_spec('/etc/kimchi/')
 
 # vim: expandtab tabstop=4 shiftwidth=4
-- 
1.8.3.1