diff options
| author | Dan Hill <daniel.hill@canonical.com> | 2020-02-12 15:22:31 -0700 |
|---|---|---|
| committer | Bryan Quigley <bryan.quigley@canonical.com> | 2020-02-13 16:32:34 -0800 |
| commit | 4a687b6dc84403156973947691be4922161545bf (patch) | |
| tree | a6106699e40a991c5bc5be5af7fc5871e596ec40 | |
| parent | 4a5409df880ed7892285d85cd4651cb15a008321 (diff) | |
| download | sos-4a687b6dc84403156973947691be4922161545bf.tar.gz | |
[ceph] mimic/nautilus data collection update
Ceph has been focusing on administrator quality of life in the latest
releases. There are a number of shiny new tools/reports available that
should be captured to help troubleshooting ceph clusters.
This is a first pass at updating the ceph plug-in to bring it inline
with upstream changes.
This fix also addresses several inconsistencies in reports that were
captured between mon/mgr/mds/osd/radosgw services.
Further improvements are possible here, but I recommend splitting up
the ceph plug-in into service-specific modules. See Issue #1945.
Resolves: #1947
Signed-off-by: Dan Hill daniel.hill@canonical.com
Signed-off-by: Bryan Quigley <bryan.quigley@canonical.com>
| -rw-r--r-- | sos/plugins/ceph.py | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/sos/plugins/ceph.py b/sos/plugins/ceph.py index 610fd0af..2beafa77 100644 --- a/sos/plugins/ceph.py +++ b/sos/plugins/ceph.py @@ -32,7 +32,9 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): 'ceph-nfs@pacemaker', 'ceph-mds@%s' % ceph_hostname, 'ceph-mon@%s' % ceph_hostname, - 'ceph-mgr@%s' % ceph_hostname + 'ceph-mgr@%s' % ceph_hostname, + 'ceph-radosgw@*', + 'ceph-osd@*' ) def setup(self): @@ -62,15 +64,24 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): "ceph mon stat", "ceph mon_status", "ceph quorum_status", + "ceph mgr module ls", + "ceph mgr metadata", + "ceph osd metadata", "ceph osd erasure-code-profile ls", "ceph report", "ceph osd crush show-tunables", "ceph-disk list", "ceph versions", + "ceph features", "ceph insights", "ceph osd crush dump", "ceph -v", - "ceph-volume lvm list" + "ceph-volume lvm list", + "ceph crash stat", + "ceph crash ls", + "ceph config log", + "ceph config generate-minimal-conf", + "ceph config-key dump", ]) ceph_cmds = [ @@ -81,12 +92,20 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): "osd df tree", "osd dump", "osd df", + "osd perf", + "osd blocked-by", + "osd pool ls detail", + "osd numa-status", + "device ls", "mon dump", + "mgr dump", + "mds stat", "df", "df detail", "fs ls", "fs dump", "pg dump", + "pg stat", ] self.add_cmd_output([ @@ -97,6 +116,7 @@ class Ceph(Plugin, RedHatPlugin, UbuntuPlugin): "ceph %s --format json-pretty" % s for s in ceph_cmds ], subdir="json_output") + self.add_service_status(self.services) for service in self.services: self.add_journal(units=service) |