From f8e4bcfd5929473e4aabbe20ade7c250234dbd52 Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Mon, 17 Oct 2022 11:16:52 +0200 Subject: [PATCH] mgr/prometheus: fix module crash when trying to collect OSDs metrics Fixes: https://tracker.ceph.com/issues/57876 Signed-off-by: Redouane Kachach --- src/pybind/mgr/prometheus/module.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py index ee79951123d1..d45ec584a3d0 100644 --- a/src/pybind/mgr/prometheus/module.py +++ b/src/pybind/mgr/prometheus/module.py @@ -1072,8 +1072,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() -- 2.47.3