Re-enable proxy_url for alertmanager receivers #4741
Merged
Conversation
This file contains hidden or 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
|
Not sure why the test failed, I've tried that locally and did not see this error. Rebased the branch to master to retry this, plus added the CHANGELOG.md change which was missing before. |
alvinlin123
reviewed
May 26, 2022
CHANGELOG.md
Outdated
| @@ -10,6 +10,7 @@ | |||
| * [CHANGE] Fix incorrectly named `cortex_cache_fetched_keys` and `cortex_cache_hits` metrics. Renamed to `cortex_cache_fetched_keys_total` and `cortex_cache_hits_total` respectively. #4686 | |||
| * [CHANGE] Enable Thanos series limiter in store-gateway. #4702 | |||
| * [CHANGE] Distributor: Apply `max_fetched_series_per_query` limit for `/series` API. #4683 | |||
| * [CHANGE] Re-enable the `proxy_url` option for receiver configuration. #4680 | |||
There was a problem hiding this comment.
In change log, the convention is to put the PR number instead of the issue number. May I ask you to kindly update it? Thanks!
Signed-off-by: Patrick Bänziger <[email protected]>
friedrichg
approved these changes
May 27, 2022
alvinlin123
approved these changes
May 31, 2022
3 tasks
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:
It re-enables the
proxy_urloption for alertmanager receivers.Originally introduced with #4129 . We believe this might have been an overly cautious fix and propose to re-enable this option again. This seems to be the consensus in the follow-up discussion. #4129 (comment) by @alvinlin123
Which issue(s) this PR fixes:
Fixes #4680
Checklist
Documentation addedCHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]