[kdump] Collect vmcore-dmesg.txt files based on path and device

kdump allows to configure to which filesystem and what path it will
write contents of '/proc/vmcore'. kdump plugin currently only checks against
a hardcoded path '/var/crash/*/vmcore-dmesg.txt'.

With this change it will check the 'path' variable and also
filesystems type ext2, ext3, ext4 or xfs against fstab. This will make
the plugin check in the correct path in the system.

Resolves: #1546

Signed-off-by: Mikel Olasagasti Uranga <mikel@olasagasti.info>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>

1 files changed, 27 insertions, 0 deletions

diff --git a/sos/plugins/kdump.py b/sos/plugins/kdump.py
index 48522767..83b00280 100644
--- a/sos/plugins/kdump.py
+++ b/sos/plugins/kdump.py
@@ -27,12 +27,39 @@ class RedHatKDump(KDump, RedHatPlugin):
     files = ('/etc/kdump.conf',)
     packages = ('kexec-tools',)
 
+    def fstab_parse_fs(self, device):
+        with open('/etc/fstab', 'r') as fp:
+            for line in fp:
+                if line.startswith((device)):
+                    return line.split()[1].rstrip('/')
+        return ""
+
+    def read_kdump_conffile(self):
+        fs = ""
+        path = "/var/crash"
+
+        with open('/etc/kdump.conf', 'r') as fp:
+            for line in fp:
+                if line.startswith("path"):
+                    path = line.split()[1]
+                elif line.startswith(("ext2", "ext3", "ext4", "xfs")):
+                    device = line.split()[1]
+                    fs = self.fstab_parse_fs(device)
+        return fs + path
+
     def setup(self):
         self.add_copy_spec([
             "/etc/kdump.conf",
             "/etc/udev/rules.d/*kexec.rules",
             "/var/crash/*/vmcore-dmesg.txt"
         ])
+        try:
+            path = self.read_kdump_conffile()
+        except Exception:
+            # set no filesystem and default path
+            path = "/var/crash"
+
+        self.add_copy_spec("{}/*/vmcore-dmesg.txt".format(path))
 
 
 class DebianKDump(KDump, DebianPlugin, UbuntuPlugin):