]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/prometheus: no ports in osd_metadata
authorJan Fajerski <jfajerski@suse.com>
Wed, 11 Oct 2017 10:28:19 +0000 (12:28 +0200)
committerJohn Spray <john.spray@redhat.com>
Wed, 1 Nov 2017 23:03:26 +0000 (23:03 +0000)
Ports might change on a OSD restart and this would create a new metadata
metric for this osd.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit 48fec7db4b214fe8ef6a04f8cb53fb8a2fb9c2ca)

src/pybind/mgr/prometheus/module.py

index 618d003e34b26ea351e5b2f7c17270f981938ad5..c086eaadf29896acacab649ab6f6fa85d3a8a97e 100644 (file)
@@ -275,8 +275,8 @@ class Module(MgrModule):
         osd_devices = self.get('osd_map_crush')['devices']
         for osd in osd_map['osds']:
             id_ = osd['osd']
-            p_addr = osd['public_addr']
-            c_addr = osd['cluster_addr']
+            p_addr = osd['public_addr'].split(':')[0]
+            c_addr = osd['cluster_addr'].split(':')[0]
             dev_class = next((osd for osd in osd_devices if osd['id'] == id_))
             self.metrics['osd_metadata'].set(0, (
                 c_addr,