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 <mgolub@suse.com>

diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index 4159d5044e050871bf23ab9d686b4256dcf35fad..11e965fbda2a30c04c732233707e10c7d0324078 100644 (file)
--- 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 8dbdad0fbbaaa0fa686ef38f22b7ef0c52af6f3d..3d9bbf93946a5915dabcc95ecc08ab6e8d3fcd0e 100644 (file)
--- a/src/tools/rbd_mirror/ImageReplayer.cc
+++ b/src/tools/rbd_mirror/ImageReplayer.cc
@@ -1741,7 +1741,7 @@ void ImageReplayer<I>::register_admin_socket_hook() {
 
       CephContext *cct = static_cast<CephContext *>(m_local_io_ctx.cct());
       auto prio = cct->_conf.get_val<int64_t>("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",