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: v18.2.0~10^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ced6dac10826606a82bd25ad713eac76fde2ecae;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.

(cherry picked from commit 9a6f01d0d229177a23175b5985d12aa140ca6271)
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index cb7e9f26f7d8..593a08f009e9 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -961,7 +961,9 @@ class CephExporter(object):
         self.image = image
 
         self.sock_dir = config_json.get('sock-dir', '/var/run/ceph/')
-        self.addrs = config_json.get('addrs', socket.gethostbyname(socket.gethostname()))
+        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)
         self.stats_period = config_json.get('stats-period', 5)