From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Tue, 19 Mar 2024 16:35:53 +0000 (-0400)
Subject: Merge pull request #55874 from adk3798/only-bind-to-network
X-Git-Tag: v20.0.0~2368
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5ecb9dd933f40a4813863f46da2c7e046defd8ea;p=ceph.git

Merge pull request #55874 from adk3798/only-bind-to-network

mgr/cephadm: allow grafana and prometheus to only bind to specific network

Reviewed-by: John Mulligan <jmulligan@redhat.com>
---

5ecb9dd933f40a4813863f46da2c7e046defd8ea
diff --cc src/pybind/mgr/cephadm/services/monitoring.py
index 4f9102d1c116,10ddcbbd02f0..184fb0251b82
--- a/src/pybind/mgr/cephadm/services/monitoring.py
+++ b/src/pybind/mgr/cephadm/services/monitoring.py
@@@ -444,10 -431,15 +455,17 @@@ class PrometheusService(CephadmService)
              'haproxy_sd_url': haproxy_sd_url,
              'ceph_exporter_sd_url': ceph_exporter_sd_url,
              'nvmeof_sd_url': nvmeof_sd_url,
 +            'external_prometheus_targets': targets,
 +            'cluster_fsid': FSID
          }
  
+         ip_to_bind_to = ''
+         if spec.only_bind_port_on_networks and spec.networks:
+             assert daemon_spec.host is not None
+             ip_to_bind_to = self.mgr.get_first_matching_network_ip(daemon_spec.host, spec) or ''
+             if ip_to_bind_to:
+                 daemon_spec.port_ips = {str(port): ip_to_bind_to}
+ 
          web_context = {
              'prometheus_web_user': prometheus_user,
              'prometheus_web_password': password_hash(prometheus_password),