|
 |
b939f5 |
From 7da0d24619928690f4999ffc1693b643b612f130 Mon Sep 17 00:00:00 2001
|
|
|
b939f5 |
From: Tomas Petr <tpetr@redhat.com>
|
|
|
b939f5 |
Date: Thu, 11 May 2017 11:16:33 +0200
|
|
|
b939f5 |
Subject: [PATCH] [ceph] exclude temporary mount locations from collection
|
|
|
b939f5 |
|
|
|
b939f5 |
Do not collect temporary mount paths at /var/lib/ceph/tmp/mnt.XXXX.
|
|
|
b939f5 |
|
|
|
b939f5 |
Resolves #1006
|
|
|
b939f5 |
Replaces #1005
|
|
|
b939f5 |
|
|
|
b939f5 |
Signed-off-by: Tomas Petr <tpetr@redhat.com>
|
|
|
b939f5 |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
b939f5 |
---
|
|
|
b939f5 |
sos/plugins/ceph.py | 7 +++++++
|
|
|
b939f5 |
1 file changed, 7 insertions(+)
|
|
|
b939f5 |
|
|
|
b939f5 |
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py
|
|
|
b939f5 |
index 1be7fd9..0b375d1 100644
|
|
|
b939f5 |
--- a/sos/plugins/ceph.py
|
|
|
b939f5 |
+++ b/sos/plugins/ceph.py
|
|
|
b939f5 |
@@ -81,6 +81,13 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin):
|
|
|
b939f5 |
self.add_forbidden_path("/var/lib/ceph/*/*/*keyring*")
|
|
|
b939f5 |
self.add_forbidden_path("/var/lib/ceph/osd/*")
|
|
|
b939f5 |
self.add_forbidden_path("/var/lib/ceph/mon/*")
|
|
|
b939f5 |
+
|
|
|
b939f5 |
+# Excludes temporary ceph-osd mount location like
|
|
|
b939f5 |
+# /var/lib/ceph/tmp/mnt.XXXX from sos collection.
|
|
|
b939f5 |
+# In the /var/lib/ceph/tmp/ can still other files of potential
|
|
|
b939f5 |
+# interest exists, so exclude only known temporary mount locations.
|
|
|
b939f5 |
+
|
|
|
b939f5 |
+ self.add_forbidden_path("/var/lib/ceph/tmp/*mnt*")
|
|
|
b939f5 |
self.add_forbidden_path("/etc/ceph/*bindpass*")
|
|
|
b939f5 |
|
|
|
b939f5 |
# vim: set et ts=4 sw=4 :
|
|
|
b939f5 |
--
|
|
|
b939f5 |
2.7.4
|
|
|
b939f5 |
|