mirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-08-06 14:17:12 +02:00
Code Issues Projects Releases Wiki Activity

Don't add anchoring to exported Value matcher field

Browse Source 
Instead, just make the anchoring part of the internal regex. This helps because
some users will want to read back the `Value` field and expect it to be the
same as the input value (e.g. some tests in Cortex), or use the value in
another context which is already expected to add its own anchoring, leading to
superfluous double anchoring (such as when we translate matchers into remote
read request matchers).
This commit is contained in:
Julius Volz 2017-10-10 10:10:21 -07:00
parent 73dc96e7f5
commit 33c1171b9c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/labels/matcher.go
View File

@ -59,8 +59,7 @@ func NewMatcher(t MatchType, n, v string) (*Matcher, error) {
Value: v, Value: v,
} }
if t == MatchRegexp || t == MatchNotRegexp { if t == MatchRegexp || t == MatchNotRegexp {
m.Value = "^(?:" + v + ")$" re, err := regexp.Compile("^(?:" + v + ")$")
re, err := regexp.Compile(m.Value)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
storage/tsdb/tsdb.go
View File

@ -233,14 +233,14 @@ func convertMatcher(m *labels.Matcher) tsdbLabels.Matcher {
return tsdbLabels.Not(tsdbLabels.NewEqualMatcher(m.Name, m.Value)) return tsdbLabels.Not(tsdbLabels.NewEqualMatcher(m.Name, m.Value))
case labels.MatchRegexp: case labels.MatchRegexp:
res, err := tsdbLabels.NewRegexpMatcher(m.Name, m.Value) res, err := tsdbLabels.NewRegexpMatcher(m.Name, "^(?:"+m.Value+")$")
if err != nil { if err != nil {
panic(err) panic(err)
} }
return res return res
case labels.MatchNotRegexp: case labels.MatchNotRegexp:
res, err := tsdbLabels.NewRegexpMatcher(m.Name, m.Value) res, err := tsdbLabels.NewRegexpMatcher(m.Name, "^(?:"+m.Value+")$")
if err != nil { if err != nil {
panic(err) panic(err)
} }