From 24ecc933d109c0eba120b434d08aa560e9a56869 Mon Sep 17 00:00:00 2001 From: Pavel Moravec Date: Wed, 1 Jul 2015 12:15:41 +0200 Subject: [PATCH 1/2] [ceph] add logs, report and calamari conf Update ceph commands and add log and configuration file collection for calamari and radosgw. Resolves: #496 Resolves: rhbz#1210527 Signed-off-by: Brad Hubbard Signed-off-by: Pavel Moravec Signed-off-by: Bryn M. Reeves --- sos/plugins/ceph.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py index 52b8fff..0bfdbe0 100644 --- a/sos/plugins/ceph.py +++ b/sos/plugins/ceph.py @@ -37,17 +37,22 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): def setup(self): self.add_copy_spec([ "/etc/ceph/", - "/var/log/ceph/" + "/var/log/ceph/", + "/etc/calamari/", + "/var/log/calamari", + "/var/log/radosgw" ]) self.add_cmd_output([ "ceph status", - "ceph health", + "ceph health detail", "ceph osd tree", "ceph osd stat", "ceph osd dump", "ceph mon stat", - "ceph mon dump" + "ceph mon dump", + "ceph df", + "ceph report" ]) self.add_forbidden_path("/etc/ceph/*keyring") -- 1.8.3.1 From 696f3c605c5d6b0cb8c0703635401991bc7af934 Mon Sep 17 00:00:00 2001 From: Pavel Moravec Date: Thu, 2 Jul 2015 13:10:31 +0200 Subject: [PATCH 2/2] [ceph] add calamari-server and librados2 to the package list Enable ceph plugin also by either calamari-server or librados2 package. This ensures Calamari and Rados log collection is effective regardless of which packages are installed on a given system. This is a temporary solution until rados is split from the ceph package. Resolves: #496 Signed-off-by: Pavel Moravec Signed-off-by: Bryn M. Reeves --- sos/plugins/ceph.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py index 0bfdbe0..e9db4c6 100644 --- a/sos/plugins/ceph.py +++ b/sos/plugins/ceph.py @@ -31,7 +31,9 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): 'ceph-mds', 'ceph-common', 'libcephfs1', - 'ceph-fs-common' + 'ceph-fs-common', + 'calamari-server', + 'librados2' ) def setup(self): -- 1.8.3.1