From: Benoît Knecht <bknecht@protonmail.ch>
Date: Fri, 12 Nov 2021 14:07:35 +0000 (+0100)
Subject: pybind/mgr/mgr_module.py: Set instance_id label for rgw
X-Git-Tag: v17.1.0~17^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d924cf66cca5c119ae0549e97b61bb3b3f049245;p=ceph.git

pybind/mgr/mgr_module.py: Set instance_id label for rgw

Now that the RadosGW returns its instance ID instead of its daemon name,
replace the `ceph_daemon` label with an `instance_id` label on the `rgw`
metrics.

Signed-off-by: Benoît Knecht <bknecht@protonmail.ch>
(cherry picked from commit 9f6573bbb1eeed8fab117149a117fdffd56bdf64)
---

diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py
index 30cd1fc5e4b5..c3a295d33c7e 100644
--- a/src/pybind/mgr/mgr_module.py
+++ b/src/pybind/mgr/mgr_module.py
@@ -1336,7 +1336,13 @@ class MgrModule(ceph_module.BaseMgrModule, MgrModuleLoggingMixin):
 
     def _perfpath_to_path_labels(self, daemon: str,
                                  path: str) -> Tuple[str, Tuple[str, ...], Tuple[str, ...]]:
-        label_names = ("ceph_daemon",)  # type: Tuple[str, ...]
+        if daemon.startswith('rgw.'):
+            label_name = 'instance_id'
+            daemon = daemon[len('rgw.'):]
+        else:
+            label_name = 'ceph_daemon'
+
+        label_names = (label_name,)  # type: Tuple[str, ...]
         labels = (daemon,)  # type: Tuple[str, ...]
 
         if daemon.startswith('rbd-mirror.'):