From 4b17f9f8e2a02bed36f91976a89d0d9150534f52 Mon Sep 17 00:00:00 2001
From: Ponnuvel Palaniyappan <pponnuvel@gmail.com>
Date: Sat, 5 Oct 2024 12:45:39 +0100
Subject: [PATCH] [ceph] update ceph commands collection

Signed-off-by: Ponnuvel Palaniyappan <pponnuvel@gmail.com>
---
 sos/report/plugins/ceph_mgr.py |  5 ++++-
 sos/report/plugins/ceph_mon.py | 11 +++++++++++
 sos/report/plugins/ceph_osd.py |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/sos/report/plugins/ceph_mgr.py b/sos/report/plugins/ceph_mgr.py
index 3a2b0c8a2a..e89606d58c 100644
--- a/sos/report/plugins/ceph_mgr.py
+++ b/sos/report/plugins/ceph_mgr.py
@@ -47,12 +47,15 @@ def setup(self):
         microceph_pkg = self.policy.package_manager.pkg_by_name('microceph')
 
         ceph_mgr_cmds = ([
-            "balancer status",
+            "balancer eval",
+            "balancer status",  # For pre-Squid releases
+            "balancer status detail",
             "healthcheck history ls",
             "log last cephadm",
             "mgr dump",
             "mgr metadata",
             "mgr module ls",
+            "mgr services",
             "mgr stat",
             "mgr versions"
         ])
diff --git a/sos/report/plugins/ceph_mon.py b/sos/report/plugins/ceph_mon.py
index 8980e5d494..d73927203a 100644
--- a/sos/report/plugins/ceph_mon.py
+++ b/sos/report/plugins/ceph_mon.py
@@ -106,6 +106,7 @@ def setup(self):
             "ceph config generate-minimal-conf",
             "ceph config log",
             "ceph config-key dump",
+            "ceph crash ls",
             "ceph crash stat",
             "ceph features",
             "ceph health detail",
@@ -118,11 +119,19 @@ def setup(self):
             "ceph mgr services",
             "ceph mgr versions",
             "ceph mon stat",
+            "ceph mon features ls",
+            "ceph node ls",
+            "ceph osd crush class ls",
             "ceph osd crush dump",
+            "ceph osd crush rule ls",
             "ceph osd crush show-tunables",
             "ceph osd crush tree --show-shadow",
             "ceph osd erasure-code-profile ls",
             "ceph osd metadata",
+            "ceph osd utilization",
+            "ceph telemetry channel ls",
+            "ceph telemetry collection ls",
+            "ceph telemetry ls",
             "ceph quorum_status",
             "ceph versions",
             "ceph-disk list",
@@ -141,9 +150,11 @@ def setup(self):
             "df",
             "fs dump",
             "fs ls",
+            "fs status",
             "mds stat",
             "mon dump",
             "osd blocked-by",
+            "osd blocklist ls",
             "osd df tree",
             "osd df",
             "osd dump",
diff --git a/sos/report/plugins/ceph_osd.py b/sos/report/plugins/ceph_osd.py
index 7172697b54..843e60044a 100644
--- a/sos/report/plugins/ceph_osd.py
+++ b/sos/report/plugins/ceph_osd.py
@@ -46,6 +46,7 @@ def setup(self):
             "dump_reservations",
             # will work quincy onward
             "bluefs stats",
+            "bluestore allocator dump block",
             "bluestore bluefs device info",
             "config diff",
             "config show",