diff options
| author | Pavel Moravec <pmoravec@redhat.com> | 2015-11-27 12:43:33 +0100 |
|---|---|---|
| committer | Pavel Moravec <pmoravec@redhat.com> | 2015-11-27 12:43:33 +0100 |
| commit | 6b4b361c8b4814160d6fab2fb447f28957977e95 (patch) | |
| tree | 355d6c3a000aea076c5b96ec96013c9d47fc8b72 | |
| parent | 7da50d6ee5afce577f02339fdc285891c8485bc0 (diff) | |
| download | sos-6b4b361c8b4814160d6fab2fb447f28957977e95.tar.gz | |
[ceph] Collect (parts of) /var/lib/ceph and /var/run/ceph
Collect the two directories without some forbidden paths.
Reorder self.add_forbidden_path(..) to have some logical ordering there.
Resolves: #693
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
| -rw-r--r-- | sos/plugins/ceph.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py index 6ccb930d..10fee88c 100644 --- a/sos/plugins/ceph.py +++ b/sos/plugins/ceph.py @@ -40,6 +40,8 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): self.add_copy_spec([ "/etc/ceph/", "/var/log/ceph/", + "/var/lib/ceph/", + "/var/run/ceph/", "/etc/calamari/", "/var/log/calamari", "/var/log/radosgw" @@ -58,7 +60,10 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): ]) 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/*/*/*keyring") + self.add_forbidden_path("/var/lib/ceph/osd/*") + self.add_forbidden_path("/var/lib/ceph/osd/mon/*") # vim: set et ts=4 sw=4 : |