From c9e4c534f4066c42a726d244cf582cefde5bd636 Mon Sep 17 00:00:00 2001 From: Mykola Golub Date: Wed, 11 Dec 2019 17:37:51 +0200 Subject: [PATCH] rbd-mirror: rename per-image replication perf counters The same names for aggregated and per-image counters cause problems for prometheus. Fixes: https://tracker.ceph.com/issues/43004 Signed-off-by: Mykola Golub --- src/pybind/mgr/mgr_module.py | 4 ++-- src/tools/rbd_mirror/ImageReplayer.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py index 4159d5044e0..11e965fbda2 100644 --- a/src/pybind/mgr/mgr_module.py +++ b/src/pybind/mgr/mgr_module.py @@ -817,11 +817,11 @@ class MgrModule(ceph_module.BaseMgrModule, MgrModuleLoggingMixin): if daemon.startswith('rbd-mirror.'): match = re.match( - r'^rbd_mirror_([^/]+)/(?:(?:([^/]+)/)?)(.*)\.(replay(?:_bytes|_latency)?)$', + r'^rbd_mirror_image_([^/]+)/(?:(?:([^/]+)/)?)(.*)\.(replay(?:_bytes|_latency)?)$', path ) if match: - path = 'rbd_mirror_' + match.group(4) + path = 'rbd_mirror_image_' + match.group(4) pool = match.group(1) namespace = match.group(2) or '' image = match.group(3) diff --git a/src/tools/rbd_mirror/ImageReplayer.cc b/src/tools/rbd_mirror/ImageReplayer.cc index 8dbdad0fbba..3d9bbf93946 100644 --- a/src/tools/rbd_mirror/ImageReplayer.cc +++ b/src/tools/rbd_mirror/ImageReplayer.cc @@ -1741,7 +1741,7 @@ void ImageReplayer::register_admin_socket_hook() { CephContext *cct = static_cast(m_local_io_ctx.cct()); auto prio = cct->_conf.get_val("rbd_mirror_perf_stats_prio"); - PerfCountersBuilder plb(g_ceph_context, "rbd_mirror_" + m_name, + PerfCountersBuilder plb(g_ceph_context, "rbd_mirror_image_" + m_name, l_rbd_mirror_first, l_rbd_mirror_last); plb.add_u64_counter(l_rbd_mirror_replay, "replay", "Replays", "r", prio); plb.add_u64_counter(l_rbd_mirror_replay_bytes, "replay_bytes", -- 2.39.5