Update Alertmanager to latest main #7254
Merged
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
This commit updates Alertmanager to commit cab8ecb, which includes pull request #3686. This pull request changes a number of metrics related to UTF-8 support from gauges to counters.
grobinson-grafana
force-pushed
the
grobinson/update-am
branch
from
9bb0c50
to
74f2478
Compare
grobinson-grafana
changed the title
| @@ -219,7 +219,7 @@ func FallbackMatchersParser(l log.Logger, m *Metrics) ParseMatchers { | |||
| suggestion := sb.String() | |||
| // The input is valid in the pkg/labels parser, but not the | |||
| // new matchers/parse parser. | |||
| level.Warn(l).Log("msg", "Alertmanager is moving to a new parser for labels and matchers, and this input is incompatible. Alertmanager has instead parsed the input using the old matchers parser as a fallback. To make this input compatible with the new parser please make sure all regular expressions and values are double-quoted. If you are still seeing this message please open an issue.", "input", input, "origin", origin, "err", err, "suggestion", suggestion) | |||
| level.Warn(l).Log("msg", "Alertmanager is moving to a new parser for labels and matchers, and this input is incompatible. Alertmanager has instead parsed the input using the old matchers parser as a fallback. To make this input compatible with the new parser please make sure all regular expressions and values are double-quoted. If you are still seeing this message please open an issue.", "input", input, "origin", origin, "err", nErr, "suggestion", suggestion) | |||
There was a problem hiding this comment.
This comes from prometheus/alertmanager#3683.
| @@ -368,7 +368,7 @@ func (n *Email) getPassword() (string, error) { | |||
| if err != nil { | |||
| return "", fmt.Errorf("could not read %s: %w", n.conf.AuthPasswordFile, err) | |||
| } | |||
| return string(content), nil | |||
| return strings.TrimSpace(string(content)), nil | |||
There was a problem hiding this comment.
This comes from prometheus/alertmanager#3680.
gotjosh
approved these changes
Jan 30, 2024
gotjosh
approved these changes
Jan 30, 2024
grobinson-grafana
added a commit
that referenced
this pull request
Jan 30, 2024
4 tasks
grobinson-grafana
added a commit
that referenced
this pull request
Jan 30, 2024
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
This commit updates Alertmanager to commit cab8ecb, which includes pull request #3686. This pull request changes a number of metrics related to UTF-8 support from gauges to counters.
Which issue(s) this PR fixes or relates to
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX].about-versioning.mdupdated with experimental features.