Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ceph] Add a new profile for Ceph plugins #3293

Merged
merged 1 commit into from
Jun 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sos/report/plugins/ceph_ansible.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class CephAnsible(Plugin, RedHatPlugin, DebianPlugin):
short_desc = 'CEPH distributed storage - Ansible installer'

plugin_name = 'ceph_ansible'
profiles = ('storage',)
profiles = ('storage', 'ceph')

packages = ('ceph-ansible',)

Expand Down
2 changes: 1 addition & 1 deletion sos/report/plugins/ceph_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Ceph_Common(Plugin, RedHatPlugin, UbuntuPlugin):
short_desc = 'CEPH common'

plugin_name = 'ceph_common'
profiles = ('storage', 'virt', 'container')
profiles = ('storage', 'virt', 'container', 'ceph')

containers = ('ceph-(.*-)?(mon|rgw|osd).*',)
ceph_hostname = gethostname()
Expand Down
2 changes: 1 addition & 1 deletion sos/report/plugins/ceph_iscsi.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class CephISCSI(Plugin, RedHatPlugin, UbuntuPlugin):
short_desc = "CEPH iSCSI"

plugin_name = "ceph_iscsi"
profiles = ("storage", "virt", "container")
profiles = ("storage", "virt", "container", "ceph")
packages = ("ceph-iscsi",)
services = ("rbd-target-api", "rbd-target-gw")
containers = ("rbd-target-api.*", "rbd-target-gw.*")
Expand Down
2 changes: 1 addition & 1 deletion sos/report/plugins/ceph_mds.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class CephMDS(Plugin, RedHatPlugin, UbuntuPlugin):
short_desc = 'CEPH mds'
plugin_name = 'ceph_mds'
profiles = ('storage', 'virt', 'container')
profiles = ('storage', 'virt', 'container', 'ceph')
containers = ('ceph-(.*-)?fs.*',)
files = ('/var/lib/ceph/mds/',)

Expand Down
2 changes: 1 addition & 1 deletion sos/report/plugins/ceph_mgr.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class CephMGR(Plugin, RedHatPlugin, UbuntuPlugin):
short_desc = 'CEPH mgr'

plugin_name = 'ceph_mgr'
profiles = ('storage', 'virt', 'container')
profiles = ('storage', 'virt', 'container', 'ceph')
files = ('/var/lib/ceph/mgr/', '/var/lib/ceph/*/mgr*')
containers = ('ceph-(.*-)?mgr.*',)

Expand Down
2 changes: 1 addition & 1 deletion sos/report/plugins/ceph_mon.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class CephMON(Plugin, RedHatPlugin, UbuntuPlugin):
short_desc = 'CEPH mon'

plugin_name = 'ceph_mon'
profiles = ('storage', 'virt', 'container')
profiles = ('storage', 'virt', 'container', 'ceph')
# note: for RHCS 5 / Ceph v16 the containers serve as an enablement trigger
# but by default they are not capable of running various ceph commands in
# this plugin - the `ceph` binary is functional directly on the host
Expand Down
2 changes: 1 addition & 1 deletion sos/report/plugins/ceph_osd.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class CephOSD(Plugin, RedHatPlugin, UbuntuPlugin):
short_desc = 'CEPH osd'

plugin_name = 'ceph_osd'
profiles = ('storage', 'virt', 'container')
profiles = ('storage', 'virt', 'container', 'ceph')
containers = ('ceph-(.*-)?osd.*',)
files = ('/var/lib/ceph/osd/', '/var/lib/ceph/*/osd*')

Expand Down
2 changes: 1 addition & 1 deletion sos/report/plugins/ceph_rgw.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class CephRGW(Plugin, RedHatPlugin, UbuntuPlugin):
short_desc = 'CEPH rgw'

plugin_name = 'ceph_rgw'
profiles = ('storage', 'virt', 'container', 'webserver')
profiles = ('storage', 'virt', 'container', 'webserver', 'ceph')
containers = ('ceph-(.*)?rgw.*',)
files = ('/var/lib/ceph/radosgw',)

Expand Down