From bdaf0ec6a2210ac93e0addc7b67d524ce5e1c182 Mon Sep 17 00:00:00 2001 From: Matti Savolainen Date: Tue, 11 Oct 2016 22:00:14 +0300 Subject: [PATCH] simplify regex --- relabel/relabel_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/relabel/relabel_test.go b/relabel/relabel_test.go index 76a7ff477..4004fa96f 100644 --- a/relabel/relabel_test.go +++ b/relabel/relabel_test.go @@ -350,21 +350,21 @@ func TestRelabel(t *testing.T) { relabel: []*config.RelabelConfig{ { SourceLabels: model.LabelNames{"__meta_sd_tags"}, - Regex: config.MustNewRegexp(".*?(?:,|^)path:(/[^,]+).*"), + Regex: config.MustNewRegexp("(?:.+,|^)path:(/[^,]+).*"), Action: config.RelabelReplace, Replacement: "${1}", TargetLabel: model.LabelName("__metrics_path__"), }, { SourceLabels: model.LabelNames{"__meta_sd_tags"}, - Regex: config.MustNewRegexp(".*?(?:,|^)job:([^,]+).*"), + Regex: config.MustNewRegexp("(?:.+,|^)job:([^,]+).*"), Action: config.RelabelReplace, Replacement: "${1}", TargetLabel: model.LabelName("job"), }, { SourceLabels: model.LabelNames{"__meta_sd_tags"}, - Regex: config.MustNewRegexp(".*?(?:,|^)label:([^=]+)=([^,]+).*"), + Regex: config.MustNewRegexp("(?:.+,|^)label:([^=]+)=([^,]+).*"), Action: config.RelabelReplace, Replacement: "${2}", TargetLabel: model.LabelName("${1}"),