Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move matchers into matcher package #3996

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Move matchers into matcher package #3996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a15767
Move old parser out of pkg/labels
grobinson-grafana Aug 22, 2024
4604a33
Fix imports
grobinson-grafana Aug 22, 2024
592f249
Move matcher.go out of pkg/labels
grobinson-grafana Aug 22, 2024
46a1d4a
Rename package
grobinson-grafana Aug 22, 2024
eaf719c
Fix imports
grobinson-grafana Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions api/v2/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ import (
"github.com/prometheus/alertmanager/cluster"
"github.com/prometheus/alertmanager/config"
"github.com/prometheus/alertmanager/dispatch"
"github.com/prometheus/alertmanager/matcher"
"github.com/prometheus/alertmanager/matcher/compat"
"github.com/prometheus/alertmanager/pkg/labels"
"github.com/prometheus/alertmanager/provider"
"github.com/prometheus/alertmanager/silence"
"github.com/prometheus/alertmanager/silence/silencepb"
Expand Down Expand Up @@ -426,7 +426,7 @@ func (api *API) getAlertGroupsHandler(params alertgroup_ops.GetAlertGroupsParams
return alertgroup_ops.NewGetAlertGroupsOK().WithPayload(res)
}

func (api *API) alertFilter(matchers []*labels.Matcher, silenced, inhibited, active bool) func(a *types.Alert, now time.Time) bool {
func (api *API) alertFilter(matchers []*matcher.Matcher, silenced, inhibited, active bool) func(a *types.Alert, now time.Time) bool {
return func(a *types.Alert, now time.Time) bool {
if !a.EndsAt.IsZero() && a.EndsAt.Before(now) {
return false
Expand Down Expand Up @@ -472,19 +472,19 @@ func receiversMatchFilter(receivers []string, filter *regexp.Regexp) bool {
return false
}

func alertMatchesFilterLabels(a *prometheus_model.Alert, matchers []*labels.Matcher) bool {
func alertMatchesFilterLabels(a *prometheus_model.Alert, matchers []*matcher.Matcher) bool {
sms := make(map[string]string)
for name, value := range a.Labels {
sms[string(name)] = string(value)
}
return matchFilterLabels(matchers, sms)
}

func matchFilterLabels(matchers []*labels.Matcher, sms map[string]string) bool {
func matchFilterLabels(matchers []*matcher.Matcher, sms map[string]string) bool {
for _, m := range matchers {
v, prs := sms[m.Name]
switch m.Type {
case labels.MatchNotRegexp, labels.MatchNotEqual:
case matcher.MatchNotRegexp, matcher.MatchNotEqual:
if m.Value == "" && prs {
continue
}
Expand Down Expand Up @@ -578,16 +578,16 @@ func SortSilences(sils open_api_models.GettableSilences) {
// A silence matches a filter (list of matchers) if
// for all matchers in the filter, there exists a matcher in the silence
// such that their names, types, and values are equivalent.
func CheckSilenceMatchesFilterLabels(s *silencepb.Silence, matchers []*labels.Matcher) bool {
for _, matcher := range matchers {
func CheckSilenceMatchesFilterLabels(s *silencepb.Silence, matchers []*matcher.Matcher) bool {
for _, m1 := range matchers {
found := false
for _, m := range s.Matchers {
if matcher.Name == m.Name &&
(matcher.Type == labels.MatchEqual && m.Type == silencepb.Matcher_EQUAL ||
matcher.Type == labels.MatchRegexp && m.Type == silencepb.Matcher_REGEXP ||
matcher.Type == labels.MatchNotEqual && m.Type == silencepb.Matcher_NOT_EQUAL ||
matcher.Type == labels.MatchNotRegexp && m.Type == silencepb.Matcher_NOT_REGEXP) &&
matcher.Value == m.Pattern {
for _, m2 := range s.Matchers {
if m1.Name == m2.Name &&
(m1.Type == matcher.MatchEqual && m2.Type == silencepb.Matcher_EQUAL ||
m1.Type == matcher.MatchRegexp && m2.Type == silencepb.Matcher_REGEXP ||
m1.Type == matcher.MatchNotEqual && m2.Type == silencepb.Matcher_NOT_EQUAL ||
m1.Type == matcher.MatchNotRegexp && m2.Type == silencepb.Matcher_NOT_REGEXP) &&
m1.Value == m2.Pattern {
found = true
break
}
Expand Down Expand Up @@ -673,8 +673,8 @@ func (api *API) postSilencesHandler(params silence_ops.PostSilencesParams) middl
})
}

func parseFilter(filter []string) ([]*labels.Matcher, error) {
matchers := make([]*labels.Matcher, 0, len(filter))
func parseFilter(filter []string) ([]*matcher.Matcher, error) {
matchers := make([]*matcher.Matcher, 0, len(filter))
for _, matcherString := range filter {
matcher, err := compat.Matcher(matcherString, "api")
if err != nil {
Expand Down
68 changes: 34 additions & 34 deletions api/v2/api_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
receiver_ops "github.com/prometheus/alertmanager/api/v2/restapi/operations/receiver"
silence_ops "github.com/prometheus/alertmanager/api/v2/restapi/operations/silence"
"github.com/prometheus/alertmanager/config"
"github.com/prometheus/alertmanager/pkg/labels"
"github.com/prometheus/alertmanager/matcher"
"github.com/prometheus/alertmanager/silence"
"github.com/prometheus/alertmanager/silence/silencepb"
"github.com/prometheus/alertmanager/types"
Expand Down Expand Up @@ -376,78 +376,78 @@ func postSilences(
func TestCheckSilenceMatchesFilterLabels(t *testing.T) {
type test struct {
silenceMatchers []*silencepb.Matcher
filterMatchers []*labels.Matcher
filterMatchers []*matcher.Matcher
expected bool
}

tests := []test{
{
[]*silencepb.Matcher{createSilenceMatcher(t, "label", "value", silencepb.Matcher_EQUAL)},
[]*labels.Matcher{createLabelMatcher(t, "label", "value", labels.MatchEqual)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "value", matcher.MatchEqual)},
true,
},
{
[]*silencepb.Matcher{createSilenceMatcher(t, "label", "value", silencepb.Matcher_EQUAL)},
[]*labels.Matcher{createLabelMatcher(t, "label", "novalue", labels.MatchEqual)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "novalue", matcher.MatchEqual)},
false,
},
{
[]*silencepb.Matcher{createSilenceMatcher(t, "label", "(foo|bar)", silencepb.Matcher_REGEXP)},
[]*labels.Matcher{createLabelMatcher(t, "label", "(foo|bar)", labels.MatchRegexp)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "(foo|bar)", matcher.MatchRegexp)},
true,
},
{
[]*silencepb.Matcher{createSilenceMatcher(t, "label", "foo", silencepb.Matcher_REGEXP)},
[]*labels.Matcher{createLabelMatcher(t, "label", "(foo|bar)", labels.MatchRegexp)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "(foo|bar)", matcher.MatchRegexp)},
false,
},

{
[]*silencepb.Matcher{createSilenceMatcher(t, "label", "value", silencepb.Matcher_EQUAL)},
[]*labels.Matcher{createLabelMatcher(t, "label", "value", labels.MatchRegexp)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "value", matcher.MatchRegexp)},
false,
},
{
[]*silencepb.Matcher{createSilenceMatcher(t, "label", "value", silencepb.Matcher_REGEXP)},
[]*labels.Matcher{createLabelMatcher(t, "label", "value", labels.MatchEqual)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "value", matcher.MatchEqual)},
false,
},
{
[]*silencepb.Matcher{createSilenceMatcher(t, "label", "value", silencepb.Matcher_NOT_EQUAL)},
[]*labels.Matcher{createLabelMatcher(t, "label", "value", labels.MatchNotEqual)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "value", matcher.MatchNotEqual)},
true,
},
{
[]*silencepb.Matcher{createSilenceMatcher(t, "label", "value", silencepb.Matcher_NOT_REGEXP)},
[]*labels.Matcher{createLabelMatcher(t, "label", "value", labels.MatchNotRegexp)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "value", matcher.MatchNotRegexp)},
true,
},
{
[]*silencepb.Matcher{createSilenceMatcher(t, "label", "value", silencepb.Matcher_EQUAL)},
[]*labels.Matcher{createLabelMatcher(t, "label", "value", labels.MatchNotEqual)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "value", matcher.MatchNotEqual)},
false,
},
{
[]*silencepb.Matcher{createSilenceMatcher(t, "label", "value", silencepb.Matcher_REGEXP)},
[]*labels.Matcher{createLabelMatcher(t, "label", "value", labels.MatchNotRegexp)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "value", matcher.MatchNotRegexp)},
false,
},
{
[]*silencepb.Matcher{createSilenceMatcher(t, "label", "value", silencepb.Matcher_NOT_EQUAL)},
[]*labels.Matcher{createLabelMatcher(t, "label", "value", labels.MatchNotRegexp)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "value", matcher.MatchNotRegexp)},
false,
},
{
[]*silencepb.Matcher{createSilenceMatcher(t, "label", "value", silencepb.Matcher_NOT_REGEXP)},
[]*labels.Matcher{createLabelMatcher(t, "label", "value", labels.MatchNotEqual)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "value", matcher.MatchNotEqual)},
false,
},
{
[]*silencepb.Matcher{
createSilenceMatcher(t, "label", "(foo|bar)", silencepb.Matcher_REGEXP),
createSilenceMatcher(t, "label", "value", silencepb.Matcher_EQUAL),
},
[]*labels.Matcher{createLabelMatcher(t, "label", "(foo|bar)", labels.MatchRegexp)},
[]*matcher.Matcher{createLabelMatcher(t, "label", "(foo|bar)", matcher.MatchRegexp)},
true,
},
}
Expand Down Expand Up @@ -512,34 +512,34 @@ func TestMatchFilterLabels(t *testing.T) {
}

testCases := []struct {
matcher labels.MatchType
matcher matcher.MatchType
name string
val string
expected bool
}{
{labels.MatchEqual, "foo", "bar", true},
{labels.MatchEqual, "baz", "", true},
{labels.MatchEqual, "baz", "qux", false},
{labels.MatchEqual, "baz", "qux|", false},
{labels.MatchRegexp, "foo", "bar", true},
{labels.MatchRegexp, "baz", "", true},
{labels.MatchRegexp, "baz", "qux", false},
{labels.MatchRegexp, "baz", "qux|", true},
{labels.MatchNotEqual, "foo", "bar", false},
{labels.MatchNotEqual, "baz", "", false},
{labels.MatchNotEqual, "baz", "qux", true},
{labels.MatchNotEqual, "baz", "qux|", true},
{labels.MatchNotRegexp, "foo", "bar", false},
{labels.MatchNotRegexp, "baz", "", false},
{labels.MatchNotRegexp, "baz", "qux", true},
{labels.MatchNotRegexp, "baz", "qux|", false},
{matcher.MatchEqual, "foo", "bar", true},
{matcher.MatchEqual, "baz", "", true},
{matcher.MatchEqual, "baz", "qux", false},
{matcher.MatchEqual, "baz", "qux|", false},
{matcher.MatchRegexp, "foo", "bar", true},
{matcher.MatchRegexp, "baz", "", true},
{matcher.MatchRegexp, "baz", "qux", false},
{matcher.MatchRegexp, "baz", "qux|", true},
{matcher.MatchNotEqual, "foo", "bar", false},
{matcher.MatchNotEqual, "baz", "", false},
{matcher.MatchNotEqual, "baz", "qux", true},
{matcher.MatchNotEqual, "baz", "qux|", true},
{matcher.MatchNotRegexp, "foo", "bar", false},
{matcher.MatchNotRegexp, "baz", "", false},
{matcher.MatchNotRegexp, "baz", "qux", true},
{matcher.MatchNotRegexp, "baz", "qux|", false},
}

for _, tc := range testCases {
m, err := labels.NewMatcher(tc.matcher, tc.name, tc.val)
m, err := matcher.NewMatcher(tc.matcher, tc.name, tc.val)
require.NoError(t, err)

ms := []*labels.Matcher{m}
ms := []*matcher.Matcher{m}
require.Equal(t, tc.expected, matchFilterLabels(ms, sms))
}
}
Expand Down
6 changes: 3 additions & 3 deletions api/v2/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/go-openapi/strfmt"

open_api_models "github.com/prometheus/alertmanager/api/v2/models"
"github.com/prometheus/alertmanager/pkg/labels"
"github.com/prometheus/alertmanager/matcher"
"github.com/prometheus/alertmanager/silence/silencepb"
)

Expand Down Expand Up @@ -57,9 +57,9 @@ func createSilenceMatcher(t *testing.T, name, pattern string, matcherType silenc
}
}

func createLabelMatcher(t *testing.T, name, value string, matchType labels.MatchType) *labels.Matcher {
func createLabelMatcher(t *testing.T, name, value string, matchType matcher.MatchType) *matcher.Matcher {
t.Helper()

matcher, _ := labels.NewMatcher(matchType, name, value)
matcher, _ := matcher.NewMatcher(matchType, name, value)
return matcher
}
14 changes: 7 additions & 7 deletions cli/alert_add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (

"github.com/prometheus/alertmanager/api/v2/client/alert"
"github.com/prometheus/alertmanager/api/v2/models"
"github.com/prometheus/alertmanager/matcher"
"github.com/prometheus/alertmanager/matcher/compat"
"github.com/prometheus/alertmanager/pkg/labels"
)

type alertAddCmd struct {
Expand Down Expand Up @@ -84,26 +84,26 @@ func (a *alertAddCmd) addAlert(ctx context.Context, _ *kingpin.ParseContext) err

ls := make(models.LabelSet, len(a.labels))
for _, l := range a.labels {
matcher, err := compat.Matcher(l, "cli")
m, err := compat.Matcher(l, "cli")
if err != nil {
return err
}
if matcher.Type != labels.MatchEqual {
if m.Type != matcher.MatchEqual {
return errors.New("labels must be specified as key=value pairs")
}
ls[matcher.Name] = matcher.Value
ls[m.Name] = m.Value
}

annotations := make(models.LabelSet, len(a.annotations))
for _, a := range a.annotations {
matcher, err := compat.Matcher(a, "cli")
m, err := compat.Matcher(a, "cli")
if err != nil {
return err
}
if matcher.Type != labels.MatchEqual {
if m.Type != matcher.MatchEqual {
return errors.New("annotations must be specified as key=value pairs")
}
annotations[matcher.Name] = matcher.Value
annotations[m.Name] = m.Value
}

var startsAt, endsAt time.Time
Expand Down
16 changes: 8 additions & 8 deletions cli/format/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/go-openapi/strfmt"

"github.com/prometheus/alertmanager/api/v2/models"
"github.com/prometheus/alertmanager/pkg/labels"
"github.com/prometheus/alertmanager/matcher"
)

const DefaultDateFormat = "2006-01-02 15:04:05 MST"
Expand All @@ -48,23 +48,23 @@ func FormatDate(input strfmt.DateTime) string {
return time.Time(input).Format(*dateFormat)
}

func labelsMatcher(m models.Matcher) *labels.Matcher {
var t labels.MatchType
func labelsMatcher(m models.Matcher) *matcher.Matcher {
var t matcher.MatchType
// Support for older alertmanager releases, which did not support isEqual.
if m.IsEqual == nil {
isEqual := true
m.IsEqual = &isEqual
}
switch {
case !*m.IsRegex && *m.IsEqual:
t = labels.MatchEqual
t = matcher.MatchEqual
case !*m.IsRegex && !*m.IsEqual:
t = labels.MatchNotEqual
t = matcher.MatchNotEqual
case *m.IsRegex && *m.IsEqual:
t = labels.MatchRegexp
t = matcher.MatchRegexp
case *m.IsRegex && !*m.IsEqual:
t = labels.MatchNotRegexp
t = matcher.MatchNotRegexp
}

return &labels.Matcher{Type: t, Name: *m.Name, Value: *m.Value}
return &matcher.Matcher{Type: t, Name: *m.Name, Value: *m.Value}
}
4 changes: 2 additions & 2 deletions cli/format/format_extended.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"text/tabwriter"

"github.com/prometheus/alertmanager/api/v2/models"
"github.com/prometheus/alertmanager/pkg/labels"
"github.com/prometheus/alertmanager/matcher"
)

type ExtendedFormatter struct {
Expand Down Expand Up @@ -131,7 +131,7 @@ func extendedFormatAnnotations(labels models.LabelSet) string {
}

func extendedFormatMatchers(matchers models.Matchers) string {
lms := labels.Matchers{}
lms := matcher.Matchers{}
for _, matcher := range matchers {
lms = append(lms, labelsMatcher(*matcher))
}
Expand Down
4 changes: 2 additions & 2 deletions cli/silence_add.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (

"github.com/prometheus/alertmanager/api/v2/client/silence"
"github.com/prometheus/alertmanager/api/v2/models"
"github.com/prometheus/alertmanager/matcher"
"github.com/prometheus/alertmanager/matcher/compat"
"github.com/prometheus/alertmanager/pkg/labels"
)

func username() string {
Expand Down Expand Up @@ -101,7 +101,7 @@ func (c *silenceAddCmd) add(ctx context.Context, _ *kingpin.ParseContext) error
}
}

matchers := make([]labels.Matcher, 0, len(c.matchers))
matchers := make([]matcher.Matcher, 0, len(c.matchers))
for _, s := range c.matchers {
m, err := compat.Matcher(s, "cli")
if err != nil {
Expand Down
Loading
Loading