aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Castillo <jcastillo@redhat.com>2021-02-08 16:25:34 +0100
committerJake Hunsaker <jhunsake@redhat.com>2021-02-22 10:31:57 -0500
commit51e8213fd3a83e717fe7ef35d48d5c541b077c5f (patch)
treea73c0d8205c89e31d48f62d863beabd492a62986
parent2d697caef5fa7dc43dea4464ac9d2a49abca4969 (diff)
downloadsos-51e8213fd3a83e717fe7ef35d48d5c541b077c5f.tar.gz
[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>
-rw-r--r--sos/report/plugins/gluster.py8
1 files changed, 7 insertions, 1 deletions
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"):