Skip to content

Commit bfb4b78

Browse files
Fix use of renamed feature flags
Signed-off-by: George Robinson <george.robinson@grafana.com>
1 parent 04c6d4c commit bfb4b78

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

cmd/alertmanager/main.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ func run() int {
180180
level.Error(logger).Log("msg", "error parsing the feature flag list", "err", err)
181181
return 1
182182
}
183-
compat.InitFromFlags(logger, featureConfig)
184-
silence.InitFromFlags(logger, featureConfig)
185183
types.InitFromFlags(logger, featureConfig)
184+
silence.InitFromFlags(logger, featureConfig)
185+
compat.InitFromFlags(logger, featureConfig)
186186

187187
err = os.MkdirAll(*dataDir, 0o777)
188188
if err != nil {

silence/silence.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ var ValidateMatcher = func(m *pb.Matcher) error {
476476

477477
// InitFromFlags initializes the validation function from the flagger.
478478
func InitFromFlags(l log.Logger, f featurecontrol.Flagger) {
479-
if !f.ClassicMatchersParsing() {
479+
if !f.ClassicMode() {
480480
ValidateMatcher = func(m *pb.Matcher) error {
481481
return validateUTF8Matcher(m)
482482
}

types/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ func validateUTF8Ls(ls model.LabelSet) error {
330330

331331
// InitFromFlags initializes the validation function from the flagger.
332332
func InitFromFlags(_ log.Logger, f featurecontrol.Flagger) {
333-
if !f.ClassicMatchersParsing() {
333+
if !f.ClassicMode() {
334334
validateLs = func(ls model.LabelSet) error {
335335
return validateUTF8Ls(ls)
336336
}

0 commit comments

Comments
 (0)