RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a small number of inconsistencies in compat package logging (#3718) 

This commit fixes a small number of inconsistencies in the compat
package logging. It now has consistent use of classic matchers
parser and UTF-8 matchers parser, instead of old matchers parser
and new matchers parser.

Signed-off-by: George Robinson <george.robinson@grafana.com>
This commit is contained in:
George Robinson 2024-02-13 11:37:42 +00:00 committed by GitHub
parent f00025d037
commit 44d5f70c3b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matchers/compat/parse.go
View File

@ -133,7 +133,7 @@ func FallbackMatcherParser(l log.Logger) ParseMatcher {
// The input is valid in the pkg/labels parser, but not the matchers/parse // The input is valid in the pkg/labels parser, but not the matchers/parse
// parser. This means the input is not forwards compatible. // parser. This means the input is not forwards compatible.
suggestion := cMatcher.String() suggestion := cMatcher.String()
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) 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 classic matchers parser as a fallback. To make this input compatible with the UTF-8 matchers 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)
return cMatcher, nil return cMatcher, nil
} }
// If the input is valid in both parsers, but produces different results, // If the input is valid in both parsers, but produces different results,
@ -173,7 +173,7 @@ func FallbackMatchersParser(l log.Logger) ParseMatchers {
suggestion := sb.String() suggestion := sb.String()
// The input is valid in the pkg/labels parser, but not the // The input is valid in the pkg/labels parser, but not the
// new matchers/parse parser. // 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", nErr, "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 classic matchers parser as a fallback. To make this input compatible with the UTF-8 matchers 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)
return cMatchers, nil return cMatchers, nil
} }
// If the input is valid in both parsers, but produces different results, // If the input is valid in both parsers, but produces different results,