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