From 264a388bdf037036fb0c8b2e37ab1a30943bdee4 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 06 2021 08:11:58 +0000
Subject: import sos-4.0-9.el8


---

diff --git a/SOURCES/sos-bz1925419-gluster-pubkeys-statusfile.patch b/SOURCES/sos-bz1925419-gluster-pubkeys-statusfile.patch
new file mode 100644
index 0000000..7233b11
--- /dev/null
+++ b/SOURCES/sos-bz1925419-gluster-pubkeys-statusfile.patch
@@ -0,0 +1,56 @@
+From 51e8213fd3a83e717fe7ef35d48d5c541b077c5f Mon Sep 17 00:00:00 2001
+From: Jose Castillo <jcastillo@redhat.com>
+Date: Mon, 8 Feb 2021 16:25:34 +0100
+Subject: [PATCH] [gluster] Add glusterd public keys and status files
+
+This patch helps capture some missing files in the
+gluster plugin, i.e.:
+
+Files inside /var/lib/glusterd/glusterfind, like
+*.status files, that store the required timestamps,
+*.pem.pub files, that store ssh public keys.
+We also need to omit the glusterfind_*_secret.pem,
+which contains the openssh private key.
+
+Files inside /var/lib/glusterd/.keys, that contains
+*.pem.pub,  the ssh public key.
+
+Closes: RHBZ#1925035, RHBZ#1925419
+
+Resolves: #2411
+
+Signed-off-by: Jose Castillo <jcastillo@redhat.com>
+Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
+---
+ sos/report/plugins/gluster.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/sos/report/plugins/gluster.py b/sos/report/plugins/gluster.py
+index 7b6a9298..e1a89df2 100644
+--- a/sos/report/plugins/gluster.py
++++ b/sos/report/plugins/gluster.py
+@@ -55,6 +55,9 @@ class Gluster(Plugin, RedHatPlugin):
+ 
+     def setup(self):
+         self.add_forbidden_path("/var/lib/glusterd/geo-replication/secret.pem")
++        self.add_forbidden_path(
++            "/var/lib/glusterd/glusterfind/glusterfind_*_secret.pem"
++        )
+ 
+         self.add_cmd_output([
+             "gluster peer status",
+@@ -72,7 +75,10 @@ class Gluster(Plugin, RedHatPlugin):
+             "/etc/glusterfs",
+             "/var/lib/glusterd/",
+             # collect nfs-ganesha related configuration
+-            "/run/gluster/shared_storage/nfs-ganesha/"
++            "/run/gluster/shared_storage/nfs-ganesha/",
++            # collect status files and public ssh keys
++            "/var/lib/glusterd/.keys/",
++            "/var/lib/glusterd/glusterfind/"
+         ] + glob.glob('/run/gluster/*tier-dht/*'))
+ 
+         if not self.get_option("all_logs"):
+-- 
+2.26.2
+
diff --git a/SPECS/sos.spec b/SPECS/sos.spec
index 9dad486..c69f9d1 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: 8%{?dist}
+Release: 9%{?dist}
 Group: Applications/System
 Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
 Source1: sos-audit-%{auditversion}.tgz
@@ -40,6 +40,7 @@ Patch17: sos-bz1912910-empty-file-stops-collecting.patch
 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
 
 
 %description
@@ -71,6 +72,7 @@ support technicians and developers.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %build
 %py3_build
@@ -133,6 +135,10 @@ of the system.  Currently storage and filesystem commands are audited.
 %ghost /etc/audit/rules.d/40-sos-storage.rules
 
 %changelog
+* Fri Mar 05 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-9
+- [gluster] Add glusterd public keys and status files
+  Resolves: bz1925419
+
 * Tue Feb 16 2021 Pavel Moravec <pmoravec@redhat.com> = 4.0-8
 - Automatically create directory for sos-cleaner default_mapping
   Resolves: bz1923937