Fix formatting after merge conflict in config.go

Signed-off-by: Ben Ridley <benridley29@gmail.com>
prometheus · Feb 28, 2021 · 3a5f4e5 · 3a5f4e5
1 parent d0217a8
commit 3a5f4e5
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/config/config.go b/config/config.go
@@ -630,12 +630,14 @@ type Route struct {
 	GroupByStr []string          `yaml:"group_by,omitempty" json:"group_by,omitempty"`
 	GroupBy    []model.LabelName `yaml:"-" json:"-"`
 	GroupByAll bool              `yaml:"-" json:"-"`
-
-	Match             map[string]string `yaml:"match,omitempty" json:"match,omitempty"`
-	MatchRE           MatchRegexps      `yaml:"match_re,omitempty" json:"match_re,omitempty"`
-	MuteTimeIntervals []string          `yaml:"mute_time_intervals,omitempty" json:"mute_time_intervals,omitempty"`
-	Continue          bool              `yaml:"continue" json:"continue,omitempty"`
-	Routes            []*Route          `yaml:"routes,omitempty" json:"routes,omitempty"`
+	// Deprecated. Remove before v1.0 release.
+	Match map[string]string `yaml:"match,omitempty" json:"match,omitempty"`
+	// Deprecated. Remove before v1.0 release.
+	MatchRE           MatchRegexps `yaml:"match_re,omitempty" json:"match_re,omitempty"`
+	Matchers          Matchers     `yaml:"matchers,omitempty" json:"matchers,omitempty"`
+	MuteTimeIntervals []string     `yaml:"mute_time_intervals,omitempty" json:"mute_time_intervals,omitempty"`
+	Continue          bool         `yaml:"continue" json:"continue,omitempty"`
+	Routes            []*Route     `yaml:"routes,omitempty" json:"routes,omitempty"`
 
 	GroupWait      *model.Duration `yaml:"group_wait,omitempty" json:"group_wait,omitempty"`
 	GroupInterval  *model.Duration `yaml:"group_interval,omitempty" json:"group_interval,omitempty"`