]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
exporter: ceph-exporter scrapes failing on multi-homed server 52084/head
authorAvan Thakkar <athakkar@redhat.com>
Thu, 15 Jun 2023 11:18:54 +0000 (16:48 +0530)
committeravanthakkar <avanjohn@gmail.com>
Wed, 28 Jun 2023 16:23:35 +0000 (21:53 +0530)
Fixes: https://tracker.ceph.com/issues/61669
Signed-off-by: Avan Thakkar <athakkar@redhat.com>
Adopted ceph-exporter deployment in cephadm
to bind to all addresses on a machine.

src/cephadm/cephadm.py

index 052be3fb0d00677b795b386c671bac3157ff4245..632b2042690739dd77766278c258be08c0596d77 100755 (executable)
@@ -1005,9 +1005,8 @@ class CephExporter(object):
         self.image = image
 
         self.sock_dir = config_json.get('sock-dir', '/var/run/ceph/')
-        ipv4_addrs, ipv6_addrs = get_ip_addresses(get_hostname())
-        # use the first ipv4 (if any) otherwise use the first ipv6
-        addrs = next(iter(ipv4_addrs or ipv6_addrs), None)
+        ipv4_addrs, _ = get_ip_addresses(get_hostname())
+        addrs = '0.0.0.0' if ipv4_addrs else '::'
         self.addrs = config_json.get('addrs', addrs)
         self.port = config_json.get('port', self.DEFAULT_PORT)
         self.prio_limit = config_json.get('prio-limit', 5)