From: Neha Ojha <nojha@redhat.com>
Date: Thu, 4 Nov 2021 21:27:48 +0000 (-0700)
Subject: Merge pull request #43406 from ljflores/wip-telemetry-perf-improvements
X-Git-Tag: v17.1.0~501
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F43819%2Fhead;p=ceph.git

Merge pull request #43406 from ljflores/wip-telemetry-perf-improvements

mgr/telemetry: add mempool stats to telemetry perf report

Reviewed-by: Yaarit Hatuka <yaarit@redhat.com>
---

2badd25cff4b5aad0563694bfec692f949b8e459
diff --cc src/pybind/mgr/telemetry/module.py
index 625b2a41a0bd,dd120ff9d0ae..e54a4621891f
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@@ -910,15 -926,14 +946,18 @@@ class Module(MgrModule)
              report['crashes'] = self.gather_crashinfo()
  
          if 'perf' in channels:
 -            report['perf_counters'] = self.gather_perf_counters()
 +            report['perf_counters_aggregated'] = self.gather_perf_counters('aggregated')
 +            report['perf_counters_separated'] = self.gather_perf_counters('separated')
 +
              report['stat_sum_per_pool'] = self.get_stat_sum_per_pool()
              report['io_rate'] = self.get_io_rate()
 -            report['osd_perf_histograms'] = self.get_osd_histograms()
 +
 +            report['osd_perf_histograms_aggregated'] = self.get_osd_histograms('aggregated')
 +            report['osd_perf_histograms_separated'] = self.get_osd_histograms('separated')
  
+             report['mempool_aggregated'] = self.get_mempool('aggregated')
+             report['mempool_separated'] = self.get_mempool('separated')
+ 
          # NOTE: We do not include the 'device' channel in this report; it is
          # sent to a different endpoint.