[ceph] Add a new profile for Ceph plugins

This patch helps simplify the capture of data from ceph plugins. After the original code was divided in 8 different plugins, it may be a bit confusing which plugins to use when running sos and attempting to capture only ceph data. By selecting the profile, sos will activate only these ceph_* plugins that apply to a specific ceph node. Signed-off-by: Jose Castillo <[email protected]>
sosreport · Jun 29, 2023 · 9b5d6ad · 9b5d6ad
1 parent 2aec599
commit 9b5d6ad
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/sos/report/plugins/ceph_ansible.py b/sos/report/plugins/ceph_ansible.py
@@ -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',)
 

diff --git a/sos/report/plugins/ceph_common.py b/sos/report/plugins/ceph_common.py
@@ -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()

diff --git a/sos/report/plugins/ceph_iscsi.py b/sos/report/plugins/ceph_iscsi.py
@@ -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.*")

diff --git a/sos/report/plugins/ceph_mds.py b/sos/report/plugins/ceph_mds.py
@@ -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/',)
 

diff --git a/sos/report/plugins/ceph_mgr.py b/sos/report/plugins/ceph_mgr.py
@@ -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.*',)
 

diff --git a/sos/report/plugins/ceph_mon.py b/sos/report/plugins/ceph_mon.py
@@ -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

diff --git a/sos/report/plugins/ceph_osd.py b/sos/report/plugins/ceph_osd.py
@@ -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*')
 

diff --git a/sos/report/plugins/ceph_rgw.py b/sos/report/plugins/ceph_rgw.py
@@ -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',)