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>

diff --cc src/cephadm/cephadmlib/daemons/monitoring.py
Simple merge

diff --cc src/cephadm/tests/test_deploy.py
Simple merge

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge

diff --cc src/pybind/mgr/cephadm/services/monitoring.py
index 328b94ebbd6ef82e46933bbec0ad2e47a63a1b2f,cc8ebd1d628ed27453b33fdc361100fece95e787..cd876d08d4e865607fe77deb4a4a0b09f9ce7899
--- 1/src/pybind/mgr/cephadm/services/monitoring.py
--- 2/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),

diff --cc src/pybind/mgr/cephadm/tests/test_services.py
Simple merge

diff --cc src/python-common/ceph/deployment/service_spec.py
Simple merge