]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/prometheus: Skip bogus entries
authorBoris Ranto <branto@redhat.com>
Fri, 16 Feb 2018 03:53:39 +0000 (04:53 +0100)
committerBoris Ranto <branto@redhat.com>
Mon, 19 Feb 2018 16:30:46 +0000 (17:30 +0100)
The osd data can contain bogus '-' entries, skip these when populating
osd metadata and disk occupation.

Signed-off-by: Boris Ranto <branto@redhat.com>
src/pybind/mgr/prometheus/module.py

index 74aceeaad44eaeabd31f363e6029dbda7314ab00..fec46138ae9c758af69c9928844d9869185aaf09 100644 (file)
@@ -284,6 +284,12 @@ class Module(MgrModule):
             id_ = osd['osd']
             p_addr = osd['public_addr'].split(':')[0]
             c_addr = osd['cluster_addr'].split(':')[0]
+            if p_addr == "-" or c_addr == "-":
+                self.log.info(
+                    "Missing address metadata for osd {0}, skipping occupation"
+                    " and metadata records for this osd".format(id_)
+                )
+                continue
             dev_class = next((osd for osd in osd_devices if osd['id'] == id_))
             self.metrics['osd_metadata'].set(1, (
                 c_addr,