From: Redouane Kachach <rkachach@redhat.com>
Date: Mon, 17 Oct 2022 09:16:52 +0000 (+0200)
Subject: mgr/prometheus: fix module crash when trying to collect OSDs metrics
X-Git-Tag: v17.2.6~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4627e022a3a7d1f086683816993344de5dc779c7;p=ceph.git

mgr/prometheus: fix module crash when trying to collect OSDs metrics
Fixes: https://tracker.ceph.com/issues/57876

Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit f8e4bcfd5929473e4aabbe20ade7c250234dbd52)
---

diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py
index d100195b7d99..ae464a597010 100644
--- a/src/pybind/mgr/prometheus/module.py
+++ b/src/pybind/mgr/prometheus/module.py
@@ -1094,8 +1094,9 @@ class Module(MgrModule):
         for server in self.list_servers():
             host = cast(str, server.get('hostname', ''))
             for service in cast(List[ServiceInfoT], server.get('services', [])):
-                ret.update({(service['id'], service['type']): (
-                    host, service['ceph_version'], service.get('name', ''))})
+                ret.update({(service['id'], service['type']): (host,
+                                                               service.get('ceph_version', 'unknown'),
+                                                               service.get('name', ''))})
         return ret
 
     @profile_method()