]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commit
Use grafana_server_addr to set prometheus networks list mergify/bp/stable-9.0/pr-7649 7653/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:23 +0000 (15:13 +0000)
commit674ad1df66db93bebd64ffa4c46a8fb24bfaf8e3
tree944e4025d1f02d99bb8655ab81c5aa99748a2f09
parent5cce92a151dca3a4512ae27c1a51840f3c27e9bc
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