From f7292b0121408a77d9e5ee94a046025c256cd021 Mon Sep 17 00:00:00 2001
From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Date: Wed, 20 May 2020 14:07:13 +0530
Subject: [PATCH] [memory]:Add support to collect memory logs

This patch updates memory plugin to collect
hugepage memory information

Resolves: #2078

Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
---
 sos/plugins/memory.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sos/plugins/memory.py b/sos/plugins/memory.py
index aefb27b8..b358e44d 100644
--- a/sos/plugins/memory.py
+++ b/sos/plugins/memory.py
@@ -27,7 +27,8 @@ class Memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin):
             "/proc/pagetypeinfo",
             "/proc/vmallocinfo",
             "/sys/kernel/mm/ksm",
-            "/sys/kernel/mm/transparent_hugepage/enabled"
+            "/sys/kernel/mm/transparent_hugepage/enabled",
+            "/sys/kernel/mm/hugepages"
         ])
         self.add_cmd_output("free", root_symlink="free")
         self.add_cmd_output([
-- 
2.26.2

From 2826d4ad19afaa91e2e25970eafe9353d844bfac Mon Sep 17 00:00:00 2001
From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Date: Wed, 20 May 2020 14:05:48 +0530
Subject: [PATCH] [scsi]:Add support to collect scsi logs

This patch updates scsi plugin to collect
virtual I/O server information.

This patch reads lspath, lsmap and lsnports data
which provides information about virtual device
path, ports and mapping Information

Related: #2078

Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
---
 sos/plugins/scsi.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sos/plugins/scsi.py b/sos/plugins/scsi.py
index bf6c2862..7a8efabb 100644
--- a/sos/plugins/scsi.py
+++ b/sos/plugins/scsi.py
@@ -30,6 +30,9 @@ class Scsi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin):
 
         self.add_cmd_output("lsscsi -i", suggest_filename="lsscsi")
         self.add_cmd_output("sg_map -x")
+        self.add_cmd_output("lspath")
+        self.add_cmd_output("lsmap -all")
+        self.add_cmd_output("lsnports")
 
         scsi_hosts = glob("/sys/class/scsi_host/*")
         self.add_udev_info(scsi_hosts, attrs=True)
-- 
2.26.2

From 56bfae87ee5e613bb6743026a7285320f19e66d5 Mon Sep 17 00:00:00 2001
From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Date: Wed, 20 May 2020 14:03:58 +0530
Subject: [PATCH] [infiniband]:Add support to collect InfiniBand logs

This patch updates Infiniband plugin to collect
InfiniBand switch node information.

Related: #2078

Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
---
 sos/plugins/infiniband.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sos/plugins/infiniband.py b/sos/plugins/infiniband.py
index 83c32791..670f05b6 100644
--- a/sos/plugins/infiniband.py
+++ b/sos/plugins/infiniband.py
@@ -33,7 +33,8 @@ class Infiniband(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
             "ibv_devices",
             "ibv_devinfo -v",
             "ibstat",
-            "ibstatus"
+            "ibstatus",
+            "ibswitches"
         ])
 
         # run below commands for every IB device and its active port
-- 
2.26.2

From d8aa0a17d94ec08fc899fce3c343f25d19134eb3 Mon Sep 17 00:00:00 2001
From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Date: Wed, 20 May 2020 14:01:40 +0530
Subject: [PATCH] [kdump]:Add support to collect kdump & fadump logs

This patch updates kdump plugin to collect kdump and
fadump information.

In this patch we are reading, kdump configuration,panic
and kexec_loaded files which are helpful to debug kdump
failure issues

This patch also reads sys/kernel/fadump_enabled
and /sys/kernel/fadump/enabled both files as there
is upstream work to deprecate these files

Related: #2078

Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
---
 sos/plugins/kdump.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sos/plugins/kdump.py b/sos/plugins/kdump.py
index 5fc25a9b..41d08b5b 100644
--- a/sos/plugins/kdump.py
+++ b/sos/plugins/kdump.py
@@ -21,6 +21,15 @@ class KDump(Plugin):
     def setup(self):
         self.add_copy_spec([
             "/proc/cmdline",
+            "/etc/sysconfig/kdump",
+            "/proc/sys/kernel/panic",
+            "/proc/sys/kernel/panic_on_oops",
+            "/sys/kernel/kexec_loaded",
+            "/sys/kernel/fadump_enabled",
+            "/sys/kernel/fadump/enabled",
+            "/sys/kernel/fadump_registered",
+            "/sys/kernel/fadump/registered",
+            "/sys/kernel/fadump/mem_reserved",
             "/sys/kernel/kexec_crash_loaded",
             "/sys/kernel/kexec_crash_size"
         ])
-- 
2.26.2