Use grafana_server_addr to set prometheus networks list (backport #7649) #7653
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
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 <[email protected]> (cherry picked from commit 770a527)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
This is an automatic backport of pull request #7649 done by Mergify.