Update prometheus/alertmanager to version v0.25.1-0.20230505130626-263ca5c9438e #5276
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
krishnateja325
force-pushed
the
alertmangerErrorFiltering
branch
2 times, most recently
from
60aa916 to
fe55d4e
Compare
krishnateja325
force-pushed
the
alertmangerErrorFiltering
branch
4 times, most recently
from
416d73f to
fce4af6
Compare
krishnateja325
force-pushed
the
alertmangerErrorFiltering
branch
3 times, most recently
from
3640598 to
11b7ed0
Compare
|
I think it would be useful if we can pull in the prometheus/alertmanager commit that includes prometheus/alertmanager#3352 as part of this PR too. |
|
Sure, I can try including that as well @alvinlin123 |
krishnateja325
force-pushed
the
alertmangerErrorFiltering
branch
3 times, most recently
from
20e48ad to
9349480
Compare
krishnateja325
force-pushed
the
alertmangerErrorFiltering
branch
from
9349480 to
f7e033e
Compare
krishnateja325
force-pushed
the
alertmangerErrorFiltering
branch
from
f7e033e to
a485436
Compare
krishnateja325
changed the title
krishnateja325
force-pushed
the
alertmangerErrorFiltering
branch
from
a485436 to
d90e1ac
Compare
yeya24
approved these changes
May 31, 2023
CHANGELOG.md
Outdated
| @@ -1,6 +1,7 @@ | |||
| # Changelog | |||
|
|
|||
| ## master / unreleased | |||
| * [CHANGE] Alertmanager: Validating new fields on the Webhook AM config. #5276 | |||
There was a problem hiding this comment.
Since this update includes multiple changes from AM and the validation change, shall we mention more update/changes we get?
There was a problem hiding this comment.
sure will include more changes in the change log.
krishnateja325
force-pushed
the
alertmangerErrorFiltering
branch
from
d90e1ac to
5dcc5a7
Compare
krishnateja325
commented
May 31, 2023
| @@ -1,6 +1,11 @@ | |||
| # Changelog | |||
|
|
|||
| ## master / unreleased | |||
| * [CHANGE] Updating prometheus/alertmanager from v0.25.0 to v0.25.1-0.20230505130626-263ca5c9438e. This includes the below changes. #5276 | |||
There was a problem hiding this comment.
Included user facing changes in the changelog.
krishnateja325
force-pushed
the
alertmangerErrorFiltering
branch
from
5dcc5a7 to
9165bbe
Compare
alvinlin123
reviewed
Jun 1, 2023
| @@ -686,11 +696,17 @@ func (c *PushoverConfig) UnmarshalYAML(unmarshal func(interface{}) error) error | |||
| if err := unmarshal((*plain)(c)); err != nil { | |||
| return err | |||
| } | |||
| if c.UserKey == "" { | |||
| return fmt.Errorf("missing user key in Pushover config") | |||
| if c.UserKey == "" && c.UserKeyFile == "" { | |||
There was a problem hiding this comment.
I think we need to disallow UserKeyFile for PushOver config too.
There was a problem hiding this comment.
Added validation to disallow UserKeyFile in PushOver Config.
alvinlin123
reviewed
Jun 1, 2023
| if c.UserKey != "" && c.UserKeyFile != "" { | ||
| return fmt.Errorf("at most one of user_key & user_key_file must be configured") | ||
| } | ||
| if c.Token == "" && c.TokenFile == "" { |
There was a problem hiding this comment.
We need to disallow TokenFIle for PushOver also.
There was a problem hiding this comment.
Added validation to disallow TokenFile in PushOver Config.
…23bc5f8ec6 Signed-off-by: Krishna Teja Puttagunta <krishtez@amazon.com> Signed-off-by: Krishna Teja Puttagunta <krishnateja325@gmail.com>
krishnateja325
force-pushed
the
alertmangerErrorFiltering
branch
from
9165bbe to
3e36cca
Compare
alvinlin123
approved these changes
Jun 1, 2023
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:
Update Prometheus to prometheus/alertmanager@263ca5c
This includes
url_filethat got introduced as part of prometheus/alertmanager@41eb121Latest released version only contains changes till 2022-12-22. Hence updating the prometheus/alertmanger to include this change.
Which issue(s) this PR fixes:
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]