]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
exporter: ceph-exporter scrapes failing on multi-homed server
authorAvan Thakkar <athakkar@redhat.com>
Thu, 15 Jun 2023 11:18:54 +0000 (16:48 +0530)
committeravanthakkar <avanjohn@gmail.com>
Fri, 28 Jul 2023 10:30:45 +0000 (16:00 +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.

(cherry picked from commit 9a6f01d0d229177a23175b5985d12aa140ca6271)

src/cephadm/cephadm.py

index cb7e9f26f7d8fe0b8329eaf7ef0f07c2ef7c3b1b..593a08f009e9a5bd9a709505333598e4346f010b 100755 (executable)
@@ -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)