|
 |
69a90f |
From c8f62ea4b6193a175add12e1795c18dad500c38e Mon Sep 17 00:00:00 2001
|
|
|
69a90f |
From: Pavel Moravec <pmoravec@redhat.com>
|
|
|
69a90f |
Date: Tue, 2 Aug 2016 11:55:23 +0200
|
|
|
69a90f |
Subject: [PATCH] [ceph] skip collecting of all keyring and bindpass files
|
|
|
69a90f |
|
|
|
69a90f |
Do not collect any keyring files - expand the add_forbidden_path
|
|
|
69a90f |
regular expressions accordingly to cover there filenames like:
|
|
|
69a90f |
|
|
|
69a90f |
/var/lib/ceph/tmp/keyring.mon.magna055
|
|
|
69a90f |
|
|
|
69a90f |
Do not either collect any /etc/ceph/*bindpass* that can store LDAP
|
|
|
69a90f |
bind passwords.
|
|
|
69a90f |
|
|
|
69a90f |
Resolves: #861
|
|
|
69a90f |
|
|
|
69a90f |
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
|
69a90f |
---
|
|
|
69a90f |
sos/plugins/ceph.py | 9 +++++----
|
|
|
69a90f |
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
69a90f |
|
|
|
69a90f |
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py
|
|
|
69a90f |
index 10fee88..74b7c4c 100644
|
|
|
69a90f |
--- a/sos/plugins/ceph.py
|
|
|
69a90f |
+++ b/sos/plugins/ceph.py
|
|
|
69a90f |
@@ -59,11 +59,12 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin):
|
|
|
69a90f |
"ceph report"
|
|
|
69a90f |
])
|
|
|
69a90f |
|
|
|
69a90f |
- self.add_forbidden_path("/etc/ceph/*keyring")
|
|
|
69a90f |
- self.add_forbidden_path("/var/lib/ceph/*keyring")
|
|
|
69a90f |
- self.add_forbidden_path("/var/lib/ceph/*/*keyring")
|
|
|
69a90f |
- self.add_forbidden_path("/var/lib/ceph/*/*/*keyring")
|
|
|
69a90f |
+ self.add_forbidden_path("/etc/ceph/*keyring*")
|
|
|
69a90f |
+ self.add_forbidden_path("/var/lib/ceph/*keyring*")
|
|
|
69a90f |
+ self.add_forbidden_path("/var/lib/ceph/*/*keyring*")
|
|
|
69a90f |
+ self.add_forbidden_path("/var/lib/ceph/*/*/*keyring*")
|
|
|
69a90f |
self.add_forbidden_path("/var/lib/ceph/osd/*")
|
|
|
69a90f |
self.add_forbidden_path("/var/lib/ceph/osd/mon/*")
|
|
|
69a90f |
+ self.add_forbidden_path("/etc/ceph/*bindpass*")
|
|
|
69a90f |
|
|
|
69a90f |
# vim: set et ts=4 sw=4 :
|
|
|
69a90f |
--
|
|
|
69a90f |
2.4.11
|
|
|
69a90f |
|