From be347440d5f8d650791ff044970c5e65ee8ec2a3 Mon Sep 17 00:00:00 2001
From: Jose Castillo <jcastillo@redhat.com>
Date: Mon, 12 Oct 2020 13:47:47 +0100
Subject: [PATCH] [kdump] Collect new kdump logfiles

Two new logfiles are available in kdump:

/var/log/kdump.log
/var/crash/*/kexec-kdump.log

The path for the second logfile mentioned above is the
default one, but this patch deals with a change in
default directory the same way that we do with the
file vmcore-dmesg.txt.

Resolves: RHBZ#1817042 and RHBZ#1887390.
Resolves: #2270

Signed-off-by: Jose Castillo <jcastillo@redhat.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
---
 sos/report/plugins/kdump.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sos/report/plugins/kdump.py b/sos/report/plugins/kdump.py
index 41d08b5b..4eccb3ff 100644
--- a/sos/report/plugins/kdump.py
+++ b/sos/report/plugins/kdump.py
@@ -71,7 +71,8 @@ class RedHatKDump(KDump, RedHatPlugin):
         self.add_copy_spec([
             "/etc/kdump.conf",
             "/etc/udev/rules.d/*kexec.rules",
-            "/var/crash/*/vmcore-dmesg.txt"
+            "/var/crash/*/vmcore-dmesg.txt",
+            "/var/log/kdump.log"
         ])
         try:
             path = self.read_kdump_conffile()
@@ -80,6 +81,7 @@ class RedHatKDump(KDump, RedHatPlugin):
             path = "/var/crash"
 
         self.add_copy_spec("{}/*/vmcore-dmesg.txt".format(path))
+        self.add_copy_spec("{}/*/kexec-kdump.log".format(path))
 
 
 class DebianKDump(KDump, DebianPlugin, UbuntuPlugin):
-- 
2.26.2