From: Adam King <47704447+adk3798@users.noreply.github.com>
Date: Tue, 16 Apr 2024 19:42:02 +0000 (-0400)
Subject: Merge pull request #56301 from adk3798/squid-only-bind-to-network
X-Git-Tag: v19.1.0~89
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f3c9e7e15dc2a0a26aad87c8d7fdd62eafe5a1d7;p=ceph.git

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

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

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

f3c9e7e15dc2a0a26aad87c8d7fdd62eafe5a1d7
diff --cc src/pybind/mgr/cephadm/services/monitoring.py
index 328b94ebbd6ef,cc8ebd1d628ed..cd876d08d4e86
--- a/src/pybind/mgr/cephadm/services/monitoring.py
+++ b/src/pybind/mgr/cephadm/services/monitoring.py
@@@ -436,10 -428,16 +447,17 @@@ class PrometheusService(CephadmService)
              'node_exporter_sd_url': node_exporter_sd_url,
              'alertmanager_sd_url': alertmanager_sd_url,
              'haproxy_sd_url': haproxy_sd_url,
 -            'ceph_exporter_sd_url': ceph_exporter_sd_url
 +            'ceph_exporter_sd_url': ceph_exporter_sd_url,
 +            'nvmeof_sd_url': nvmeof_sd_url,
          }
  
+         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),