From 75ab0ff01c10ce95f382560e098ec94768953094 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 13 2021 08:14:15 +0000
Subject: import sos-4.0-10.el8


---

diff --git a/SOURCES/sos-bz1928650-powerpc-nhv-scsi-logs.patch b/SOURCES/sos-bz1928650-powerpc-nhv-scsi-logs.patch
new file mode 100644
index 0000000..46bc02c
--- /dev/null
+++ b/SOURCES/sos-bz1928650-powerpc-nhv-scsi-logs.patch
@@ -0,0 +1,101 @@
+From 271c35b9be95cf4957150fd702823fbb46ddaa6b Mon Sep 17 00:00:00 2001
+From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
+Date: Tue, 19 Jan 2021 19:54:26 +0530
+Subject: [PATCH 1/2] [powerpc]:Add support to collect HNV infomation
+
+This patch is to update powerpc plugin to collect
+Hyper-V Network Virtualization information.
+
+/var/log/hcnmgr             -- hybridnetwork debugging messages. Must collect
+/var/ct/IBM.DRM.stderr      -- DynamicRM log messages
+/var/ct/IW/log/mc/IBM.DRM/trace* -- IBM DRM traces
+lsdevinfo
+ournalctl
+
+Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
+---
+ sos/report/plugins/kernel.py  | 1 -
+ sos/report/plugins/powerpc.py | 9 +++++++--
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/sos/report/plugins/kernel.py b/sos/report/plugins/kernel.py
+index 27e0e4d00..febe2ad0a 100644
+--- a/sos/report/plugins/kernel.py
++++ b/sos/report/plugins/kernel.py
+@@ -106,7 +106,6 @@ def setup(self):
+             "/proc/misc",
+             "/var/log/dmesg",
+             "/sys/fs/pstore",
+-            "/var/log/hcnmgr",
+             clocksource_path + "available_clocksource",
+             clocksource_path + "current_clocksource"
+         ])
+diff --git a/sos/report/plugins/powerpc.py b/sos/report/plugins/powerpc.py
+index d29eb0a63..c63551cad 100644
+--- a/sos/report/plugins/powerpc.py
++++ b/sos/report/plugins/powerpc.py
+@@ -63,7 +63,10 @@ def setup(self):
+                 "/proc/ppc64/systemcfg",
+                 "/var/log/platform",
+                 "/var/log/drmgr",
+-                "/var/log/drmgr.0"
++                "/var/log/drmgr.0",
++                "/var/log/hcnmgr",
++                "/var/ct/IBM.DRM.stderr",
++                "/var/ct/IW/log/mc/IBM.DRM/trace*"
+             ])
+             ctsnap_path = self.get_cmd_output_path(name="ctsnap", make=True)
+             self.add_cmd_output([
+@@ -74,8 +77,10 @@ def setup(self):
+                 "serv_config -l",
+                 "bootlist -m both -r",
+                 "lparstat -i",
+-                "ctsnap -xrunrpttr -d %s" % (ctsnap_path)
++                "ctsnap -xrunrpttr -d %s" % (ctsnap_path),
++                "lsdevinfo"
+             ])
++            self.add_service_status("hcn-init")
+ 
+         if isPowerNV:
+             self.add_copy_spec([
+
+From 692eba8eeec6254bdb356a6bfdc8cfa1f77bfbbc Mon Sep 17 00:00:00 2001
+From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
+Date: Tue, 19 Jan 2021 19:58:53 +0530
+Subject: [PATCH 2/2] [scsi]:Add support to collect SCSI debugging logs
+
+This patch updates scsi plugin to collect
+additional logs for SCSI devices
+
+Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
+---
+ sos/report/plugins/scsi.py | 16 ++++++++++++----
+ 1 file changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/sos/report/plugins/scsi.py b/sos/report/plugins/scsi.py
+index 50cfca0f7..28d1396c6 100644
+--- a/sos/report/plugins/scsi.py
++++ b/sos/report/plugins/scsi.py
+@@ -29,10 +29,18 @@ def setup(self):
+         ])
+ 
+         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")
++
++        self.add_cmd_output([
++            "sg_map -x",
++            "lspath",
++            "lsmap -all",
++            "lsnports",
++            "lsscsi -H",
++            "lsscsi -g",
++            "lsscsi -d",
++            "lsscsi -s",
++            "lsscsi -L"
++        ])
+ 
+         scsi_hosts = glob("/sys/class/scsi_host/*")
+         self.add_blockdev_cmd("udevadm info -a %(dev)s", devices=scsi_hosts,
diff --git a/SPECS/sos.spec b/SPECS/sos.spec
index c69f9d1..be4cec3 100644
--- a/SPECS/sos.spec
+++ b/SPECS/sos.spec
@@ -5,7 +5,7 @@
 Summary: A set of tools to gather troubleshooting information from a system
 Name: sos
 Version: 4.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
@@ -41,6 +41,7 @@ Patch18: sos-bz1917196-networking-ethtool-e-conditionally.patch
 Patch19: sos-bz1887402-kexec-logs.patch
 Patch20: sos-bz1916729-ftp-upload-no-passwd.patch
 Patch21: sos-bz1925419-gluster-pubkeys-statusfile.patch
+Patch22: sos-bz1928650-powerpc-nhv-scsi-logs.patch
 
 
 %description
@@ -73,6 +74,7 @@ support technicians and developers.
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %build
 %py3_build
@@ -135,6 +137,10 @@ of the system.  Currently storage and filesystem commands are audited.
 %ghost /etc/audit/rules.d/40-sos-storage.rules
 
 %changelog
+* Thu Mar 11 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-10
+- [powerpc] Collect logs for power specific components (HNV and SCSI)
+  Resolves: bz1928650
+
 * Fri Mar 05 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-9
 - [gluster] Add glusterd public keys and status files
   Resolves: bz1925419