From: Avan Thakkar <athakkar@redhat.com>
Date: Thu, 15 Jun 2023 11:18:54 +0000 (+0530)
Subject: exporter: ceph-exporter scrapes failing on multi-homed server
X-Git-Tag: v19.0.0~792^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a6f01d0d229177a23175b5985d12aa140ca6271;p=ceph.git

exporter: ceph-exporter scrapes failing on multi-homed server

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.
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 052be3fb0d0..632b2042690 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -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)