src/pybind/mgr: handle json-pretty for perf stats

Fixes: https://tracker.ceph.com/issues/74072
Signed-off-by: Neeraj Pratap Singh <Neeraj.Pratap.Singh1@ibm.com>

diff --git a/src/pybind/mgr/stats/fs/perf_stats.py b/src/pybind/mgr/stats/fs/perf_stats.py
index 7b97e42857a0f1104cdb018ef99296926f55e457..3c602d2e251ee8296f5972afde46f1f3c6868a49 100644 (file)
--- a/src/pybind/mgr/stats/fs/perf_stats.py
+++ b/src/pybind/mgr/stats/fs/perf_stats.py
@@ -648,4 +648,4 @@ class FSPerfStats(object):
         with self.lock:
             user_query = self.register_query(filter_spec)
             result = self.generate_report(user_query)
-        return 0, json.dumps(result), ""
+        return result

diff --git a/src/pybind/mgr/stats/module.py b/src/pybind/mgr/stats/module.py
index fcc1bce97b5cf617b3d58b4e27904e64b766b3b6..3924577b10f33c4cca02685d805a63c731de75e5 100644 (file)
--- a/src/pybind/mgr/stats/module.py
+++ b/src/pybind/mgr/stats/module.py
@@ -37,5 +37,8 @@ class Module(MgrModule):
         prefix = cmd['prefix']
         # only supported command is `fs perf stats` right now
         if prefix.startswith('fs perf stats'):
-            return self.fs_perf_stats.get_perf_data(cmd)
+            result = self.fs_perf_stats.get_perf_data(cmd)
+            if 'format' in cmd and cmd['format'] == 'json-pretty':
+                return 0, json.dumps(result, indent=2), ""
+            return 0, json.dumps(result), ""
         raise NotImplementedError(cmd['prefix'])