]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/prometheus: fix module crash when trying to collect OSDs metrics 49931/head
authorRedouane Kachach <rkachach@redhat.com>
Mon, 17 Oct 2022 09:16:52 +0000 (11:16 +0200)
committerAdam King <adking@redhat.com>
Tue, 31 Jan 2023 00:00:37 +0000 (19:00 -0500)
Fixes: https://tracker.ceph.com/issues/57876
Signed-off-by: Redouane Kachach <rkachach@redhat.com>
(cherry picked from commit f8e4bcfd5929473e4aabbe20ade7c250234dbd52)

Conflicts:
src/pybind/mgr/prometheus/module.py

src/pybind/mgr/prometheus/module.py

index 588dc6848027854eb0405ff161954a823c17282b..58d0bd98a6719689bbaf162fa0b80a3591101c9e 100644 (file)
@@ -1063,7 +1063,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()