operator: Fix application tenant alertmanager configuration #9963
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
periklis
approved these changes
Jul 17, 2023
xperimental
added a commit
to xperimental/loki
that referenced
this pull request
Jul 18, 2023
…9963) Co-authored-by: Periklis Tsirakidis <periklis@redhat.com>
periklis
added a commit
to openshift/loki
that referenced
this pull request
Jul 18, 2023
[release-5.7] Backport PR grafana#9963
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.
What this PR does / why we need it:
When in
openshift-loggingtenant mode, setting any overrides on theapplicationtenant currently overrides the automatic alert-manager configuration. This PR changes the behaviour, so that the automatic alert-manager configuration is only skipped when theapplicationtenant is already configured with a custom alert-manager.Which issue(s) this PR fixes:
https://issues.redhat.com/browse/LOG-4325
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)CHANGELOG.mdupdated