89b86368f8
Update sos in rawhide to the upstream 3.2 release and additional patches including the fix for CVE-2015-7529.
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
From 6b4b361c8b4814160d6fab2fb447f28957977e95 Mon Sep 17 00:00:00 2001
|
|
From: Pavel Moravec <pmoravec@redhat.com>
|
|
Date: Fri, 27 Nov 2015 12:43:33 +0100
|
|
Subject: [PATCH] [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>
|
|
---
|
|
sos/plugins/ceph.py | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py
|
|
index 6ccb930..10fee88 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: et ts=4 sw=4
|
|
--
|
|
2.4.3
|
|
|