From 5280e3c73894805662c831d1f6cadda8233cf402 Mon Sep 17 00:00:00 2001
From: Pavel Moravec <pmoravec@redhat.com>
Date: Fri, 3 Apr 2015 09:53:46 +0200
Subject: [PATCH 1/3] [virsh] add new plugin

Move the virsh commands and virt-manager logs into new plugin
(corresponding to the 'libvirt-client' package on Red Hat distros).

Resolves #544

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
 sos/plugins/virsh.py | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 sos/plugins/virsh.py

diff --git a/sos/plugins/virsh.py b/sos/plugins/virsh.py
new file mode 100644
index 0000000..4b6bcc0
--- /dev/null
+++ b/sos/plugins/virsh.py
@@ -0,0 +1,46 @@
+# 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
+import glob
+import os
+
+
+class LibvirtClient(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
+    """client for libvirt virtualization API
+    """
+
+    plugin_name = 'virsh'
+    profiles = ('system', 'virt')
+
+    packages = ('libvirt-client')
+
+    def setup(self):
+        # virt-manager logs
+        if not self.get_option("all_logs"):
+            self.add_copy_spec_limit("/root/.virt-manager/*", sizelimit=5)
+        else:
+            self.add_copy_spec("/root/.virt-manager/*")
+
+        # get lit of VMs/domains
+        domains_file = self.get_cmd_output_now('virsh list --all')
+
+        # cycle through the VMs/domains list, ignore 2 header lines and latest
+        # empty line, and dumpxml domain name in 2nd column
+        if domains_file:
+            domains_lines = open(domains_file, "r").read().splitlines()[2:]
+            for domain in filter(lambda x: x, domains_lines):
+                self.add_cmd_output("virsh dumpxml %s" % domain.split()[1])
+
+# vim: et ts=4 sw=4
-- 
1.8.3.1


From 60373759aaa9f0668f0200e000e6c1949334597b Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Tue, 30 Jun 2015 13:10:51 +0100
Subject: [PATCH 2/3] [libvirt] add listing of /var/lib/libvirt/qemu

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

diff --git a/sos/plugins/libvirt.py b/sos/plugins/libvirt.py
index 8d5dcfc..0b31d31 100644
--- a/sos/plugins/libvirt.py
+++ b/sos/plugins/libvirt.py
@@ -58,6 +58,8 @@ class Libvirt(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
         if os.path.exists(libvirt_keytab):
             self.add_cmd_output("klist -ket %s" % libvirt_keytab)

+        self.add_cmd_output("ls -lR /var/lib/libvirt/qemu")
+
     def postproc(self):
         for xmlfile in glob.glob("/etc/libvirt/qemu/*.xml"):
             self.do_file_sub(
-- 
1.8.3.1


From 26fa7d3ae5a6c31030ac045aeaa32452ad888df8 Mon Sep 17 00:00:00 2001
From: Pavel Moravec <pmoravec@redhat.com>
Date: Fri, 15 May 2015 16:10:41 +0200
Subject: [PATCH 3/3] [virsh] make dumpxml calls read-only and set timeout=180

Call virsh dumpxml in read-only mode to bypass authentication
and extend the command timeout to 180s.

Resolves #544

Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
---
 sos/plugins/virsh.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sos/plugins/virsh.py b/sos/plugins/virsh.py
index 4b6bcc0..0381b39 100644
--- a/sos/plugins/virsh.py
+++ b/sos/plugins/virsh.py
@@ -41,6 +41,7 @@ class LibvirtClient(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
         if domains_file:
             domains_lines = open(domains_file, "r").read().splitlines()[2:]
             for domain in filter(lambda x: x, domains_lines):
-                self.add_cmd_output("virsh dumpxml %s" % domain.split()[1])
+                self.add_cmd_output("virsh -r dumpxml %s" % domain.split()[1],
+                                    timeout=180)
 
 # vim: et ts=4 sw=4
-- 
1.8.3.1