diff options
| author | Pavel Moravec <pmoravec@redhat.com> | 2016-08-02 11:55:23 +0200 |
|---|---|---|
| committer | Pavel Moravec <pmoravec@redhat.com> | 2016-08-05 18:18:34 +0200 |
| commit | c8f62ea4b6193a175add12e1795c18dad500c38e (patch) | |
| tree | b912ee7262e404f752f1baf89401603619da1f1a | |
| parent | c746b80e91bbab8c40a0c8cc5607a221b2bed09f (diff) | |
| download | sos-c8f62ea4b6193a175add12e1795c18dad500c38e.tar.gz | |
[ceph] skip collecting of all keyring and bindpass files
Do not collect any keyring files - expand the add_forbidden_path
regular expressions accordingly to cover there filenames like:
/var/lib/ceph/tmp/keyring.mon.magna055
Do not either collect any /etc/ceph/*bindpass* that can store LDAP
bind passwords.
Resolves: #861
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
| -rw-r--r-- | sos/plugins/ceph.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py index 10fee88c..74b7c4c6 100644 --- a/sos/plugins/ceph.py +++ b/sos/plugins/ceph.py @@ -59,11 +59,12 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): "ceph report" ]) - self.add_forbidden_path("/etc/ceph/*keyring") - self.add_forbidden_path("/var/lib/ceph/*keyring") - self.add_forbidden_path("/var/lib/ceph/*/*keyring") - self.add_forbidden_path("/var/lib/ceph/*/*/*keyring") + self.add_forbidden_path("/etc/ceph/*keyring*") + self.add_forbidden_path("/var/lib/ceph/*keyring*") + self.add_forbidden_path("/var/lib/ceph/*/*keyring*") + self.add_forbidden_path("/var/lib/ceph/*/*/*keyring*") self.add_forbidden_path("/var/lib/ceph/osd/*") self.add_forbidden_path("/var/lib/ceph/osd/mon/*") + self.add_forbidden_path("/etc/ceph/*bindpass*") # vim: set et ts=4 sw=4 : |