]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commit
Use grafana_server_addr to set prometheus networks list mergify/bp/stable-8.0/pr-7649 7652/head
authorJohn Fulton <fulton@redhat.com>
Thu, 6 Feb 2025 00:01:08 +0000 (19:01 -0500)
committerMergify <37929162+mergify[bot]@users.noreply.github.com>
Thu, 6 Feb 2025 15:13:22 +0000 (15:13 +0000)
commit0458c53ab7cf58cb31fc343d6d69ec256dd87f3f
tree99db0893b9dfec2a8daf4b6f476493e98740cf8c
parent8b0339a798124f5f0faac3691810033daf6eb581
Use grafana_server_addr to set prometheus networks list

When dashboard is enabled and module ceph_orch_apply is
called, if the grafana_server_addr is defined, then it
is used to populate the networks list in the spec of type
alertmanager. This is the case without this patch. With
this patch the same logic is applied to the spec of type
prometheus. Also, if the grafana_server_addr is a comma
delimited list, then a jinja2 expression handles passing
the IPs as a list.

Without this patch prometheus binds to all networks even
if grafana_server_addr is set which can create conflicts
with other services.

Fixes: https://bugzilla.redhat.com/2269009
Signed-off-by: John Fulton <fulton@redhat.com>
(cherry picked from commit 770a527a9ee6b34091798c6120235026ad1ecfa9)
infrastructure-playbooks/cephadm-adopt.yml