From df692c44c6b8ce3e77631e1d9170ffc00245b5c1 Mon Sep 17 00:00:00 2001 From: Pere Diaz Bou Date: Mon, 10 Oct 2022 12:08:34 +0200 Subject: [PATCH] mgr/prometheus: change pg_repaired_objects name to pool_repaired_objects Fixes: https://tracker.ceph.com/issues/57806 Signed-off-by: Pere Diaz Bou (cherry picked from commit 114727fd341ab90328ac3a829807bbc39820f901) --- src/pybind/mgr/prometheus/module.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py index fd3613ee2a245..4bc9b719338d6 100644 --- a/src/pybind/mgr/prometheus/module.py +++ b/src/pybind/mgr/prometheus/module.py @@ -1570,10 +1570,17 @@ class Module(MgrModule): cast(MetricCounter, sum_metric).add(duration, (method_name,)) cast(MetricCounter, count_metric).add(1, (method_name,)) - def get_pg_repaired_objects(self) -> None: + def get_pool_repaired_objects(self) -> None: dump = self.get('pg_dump') for stats in dump['pool_stats']: - path = 'pool_objects_repaired' + path = f'pool_objects_repaired{stats["poolid"]}' + self.metrics[path] = Metric( + 'counter', + 'pool_objects_repaired', + 'Number of objects repaired in a pool Count', + ('poolid',) + ) + self.metrics[path].set(stats['stat_sum']['num_objects_repaired'], labelvalues=(stats['poolid'],)) @@ -1601,7 +1608,7 @@ class Module(MgrModule): self.get_mgr_status() self.get_metadata_and_osd_status() self.get_pg_status() - self.get_pg_repaired_objects() + self.get_pool_repaired_objects() self.get_num_objects() self.get_all_daemon_health_metrics() -- 2.39.5