mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 15:09:39 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #1045 from prometheus/anchored-label-replace

Browse source 
Change relabel_replace() to do full-string matches.
This commit is contained in:
Julius Volz 2015-09-01 17:50:36 +02:00
parent 4c90168130 61c42c8da0
commit 58780a8c79
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
promql/functions.go
View file

@ -616,7 +616,7 @@ func funcLabelReplace(ev *evaluator, args Expressions) model.Value {
regexStr = ev.evalString(args[4]).Value regexStr = ev.evalString(args[4]).Value
) )
regex, err := regexp.Compile(regexStr) regex, err := regexp.Compile("^(?:" + regexStr + ")$")
if err != nil { if err != nil {
ev.errorf("invalid regular expression in label_replace(): %s", regexStr) ev.errorf("invalid regular expression in label_replace(): %s", regexStr)
} }

11
promql/testdata/functions.test vendored
View file

@ -100,11 +100,16 @@ load 5m
testmetric{src="source-value-10",dst="original-destination-value"} 0 testmetric{src="source-value-10",dst="original-destination-value"} 0
testmetric{src="source-value-20",dst="original-destination-value"} 1 testmetric{src="source-value-20",dst="original-destination-value"} 1
# label_replace does a substring match and replace. # label_replace does a full-string match and replace.
eval instant at 0m label_replace(testmetric, "dst", "destination-value-$1", "src", "value-(.*)") eval instant at 0m label_replace(testmetric, "dst", "destination-value-$1", "src", "source-value-(.*)")
testmetric{src="source-value-10",dst="destination-value-10"} 0 testmetric{src="source-value-10",dst="destination-value-10"} 0
testmetric{src="source-value-20",dst="destination-value-20"} 1 testmetric{src="source-value-20",dst="destination-value-20"} 1
# label_replace does not do a sub-string match.
eval instant at 0m label_replace(testmetric, "dst", "destination-value-$1", "src", "value-(.*)")
testmetric{src="source-value-10",dst="original-destination-value"} 0
testmetric{src="source-value-20",dst="original-destination-value"} 1
# label_replace works with multiple capture groups. # label_replace works with multiple capture groups.
eval instant at 0m label_replace(testmetric, "dst", "$1-value-$2", "src", "(.*)-value-(.*)") eval instant at 0m label_replace(testmetric, "dst", "$1-value-$2", "src", "(.*)-value-(.*)")
testmetric{src="source-value-10",dst="source-value-10"} 0 testmetric{src="source-value-10",dst="source-value-10"} 0
@ -129,7 +134,7 @@ eval instant at 0m label_replace(testmetric, "dst", "value-$1", "src", "non-matc
testmetric{src="source-value-20",dst="original-destination-value"} 1 testmetric{src="source-value-20",dst="original-destination-value"} 1
# label_replace drops labels that are set to empty values. # label_replace drops labels that are set to empty values.
eval instant at 0m label_replace(testmetric, "dst", "", "dst", "") eval instant at 0m label_replace(testmetric, "dst", "", "dst", ".*")
testmetric{src="source-value-10"} 0 testmetric{src="source-value-10"} 0
testmetric{src="source-value-20"} 1 testmetric{src="source-value-20"} 1