fixing daemon_id for rook environment

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
ceph · Feb 7, 2024 · fda49e9 · fda49e9
1 parent e52cd13
commit fda49e9
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
@@ -1296,12 +1296,15 @@ def _get_pool_info(pool: Dict[str, Any]) -> Tuple[str, str]:
         if modify_instance_id:
             daemons = raise_if_exception(self.list_daemons(daemon_type='rgw'))
             for daemon in daemons:
+                if daemon.daemon_id and '.' in daemon.daemon_id:
+                    daemon_id_prefix = daemon.daemon_id.split(".")[2]
+                else:
+                    daemon_id_prefix = daemon.daemon_id if daemon.daemon_id else ""
                 self.metrics['rgw_metadata'].set(1,
-                                                 ('{}.{}'.format(str(daemon.daemon_type),
-                                                                 str(daemon.daemon_id)),
+                                                 (f"{daemon.daemon_type}.{daemon.daemon_id}",
                                                   str(daemon.hostname),
                                                   str(daemon.version),
-                                                  str(daemon.daemon_id).split(".")[2]))
+                                                  daemon_id_prefix))
         for key, value in servers.items():
             service_id, service_type = key
             if service_type == 'rgw' and not modify_instance_id: