Skip to content

Use grafana_server_addr to set prometheus networks list#7649

Merged
asm0deuz merged 1 commit intoceph:mainfrom
fultonj:bz2269009
Feb 6, 2025
Merged

Use grafana_server_addr to set prometheus networks list#7649
asm0deuz merged 1 commit intoceph:mainfrom
fultonj:bz2269009

Conversation

@fultonj
Copy link
Copy Markdown
Contributor

@fultonj fultonj commented Feb 6, 2025

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

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>
Copy link
Copy Markdown
Collaborator

@asm0deuz asm0deuz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@asm0deuz asm0deuz merged commit 770a527 into ceph:main Feb 6, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants