From b57d61c1cb2303a28f34ee3996f2e797bfa2b8b5 Mon Sep 17 00:00:00 2001 From: Laura Flores Date: Fri, 19 Nov 2021 15:40:16 +0000 Subject: [PATCH] mgr/telemetry: remove aggregated perf metrics from the perf channel Up until this point, we included aggregated and separated data for testing purposes. Now that we've done our testing, the aggregated metrics are no longer relevant. Aggregated metrics can still be achieved on the server side by summing separated metrics. Signed-off-by: Laura Flores --- doc/mgr/telemetry.rst | 4 ++-- .../cluster/telemetry/telemetry.component.html | 2 +- src/pybind/mgr/telemetry/module.py | 15 ++++----------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/doc/mgr/telemetry.rst b/doc/mgr/telemetry.rst index 22d68d5af7bea..f334df9af1d76 100644 --- a/doc/mgr/telemetry.rst +++ b/doc/mgr/telemetry.rst @@ -46,12 +46,12 @@ the per-channel setting has no effect.) - cluster description - contact email address -* **perf** (default: off): Aggregated performance counter metrics of a cluster, which can be used to +* **perf** (default: off): Various performance metrics of a cluster, which can be used to - reveal overall cluster health - identify workload patterns - troubleshoot issues with latency, throttling, memory management, etc. - - monitor cluster performance by daemon types + - monitor cluster performance by daemon The data being reported does *not* contain any sensitive data like pool names, object names, object contents, hostnames, or device diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.html index 2ab77d32109e2..b0420e1079017 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/telemetry/telemetry.component.html @@ -140,7 +140,7 @@ for="channel_perf"> Perf - Includes performance counter metrics summed across the cluster. + Includes various performance metrics of a cluster.
diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py index 508e400b9f3e0..9e136c1b9a7b3 100644 --- a/src/pybind/mgr/telemetry/module.py +++ b/src/pybind/mgr/telemetry/module.py @@ -900,19 +900,12 @@ class Module(MgrModule): report['crashes'] = self.gather_crashinfo() if 'perf' in channels: - report['perf_counters_aggregated'] = self.gather_perf_counters('aggregated') - report['perf_counters_separated'] = self.gather_perf_counters('separated') - + report['perf_counters'] = self.gather_perf_counters('separated') report['stats_per_pool'] = self.get('pg_dump')['pool_stats'] report['stats_per_pg'] = self.get('pg_dump')['pg_stats'] - report['io_rate'] = self.get_io_rate() - - 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') + report['osd_perf_histograms'] = self.get_osd_histograms('separated') + report['mempool'] = self.get_mempool('separated') # NOTE: We do not include the 'device' channel in this report; it is # sent to a different endpoint. @@ -1042,7 +1035,7 @@ Please consider enabling the telemetry module with 'ceph telemetry on'.''' # they are displayed horizontally instead of vertically. try: # Formatting ranges and values in osd_perf_histograms - modes_to_be_formatted = ['osd_perf_histograms_aggregated', 'osd_perf_histograms_separated'] + modes_to_be_formatted = ['osd_perf_histograms'] for mode in modes_to_be_formatted: for config in report[mode]: for histogram in config: -- 2.39.5