Browse Source

Add interpolation to good test config. Fix regex

pull/2094/head
Matti Savolainen 8 years ago
parent
commit
56907ba6e3
  1. 2
      config/config.go
  2. 11
      config/config_test.go
  3. 7
      config/testdata/conf.good.yml
  4. 0
      config/testdata/relabel_target_label.good.yml

2
config/config.go

@ -31,7 +31,7 @@ var (
patFileSDName = regexp.MustCompile(`^[^*]*(\*[^/]*)?\.(json|yml|yaml|JSON|YML|YAML)$`)
patRulePath = regexp.MustCompile(`^[^*]*(\*[^/]*)?$`)
patAuthLine = regexp.MustCompile(`((?:password|bearer_token|secret_key|client_secret):\s+)(".+"|'.+'|[^\s]+)`)
relabelTarget = regexp.MustCompile(`^(?:(?:[a-zA-Z_]|\$\{?[\w]+}?)+\w*)+$`)
relabelTarget = regexp.MustCompile(`^(?:(?:[a-zA-Z_]|\$\{?[\w]+\}?)+\w*)+$`)
)
// Load parses the YAML input s into a Config.

11
config/config_test.go

@ -207,6 +207,17 @@ var expectedConf = &Config{
Scheme: DefaultConsulSDConfig.Scheme,
},
},
RelabelConfigs: []*RelabelConfig{
{
SourceLabels: model.LabelNames{"__meta_sd_consul_tags"},
Regex: MustNewRegexp("label:([^=]+)=([^,]+)"),
Separator: ",",
TargetLabel: "${1}",
Replacement: "${2}",
Action: RelabelReplace,
},
},
},
{
JobName: "service-z",

7
config/testdata/conf.good.yml vendored

@ -104,6 +104,13 @@ scrape_configs:
- server: 'localhost:1234'
services: ['nginx', 'cache', 'mysql']
relabel_configs:
- source_labels: [__meta_sd_consul_tags]
separator: ','
regex: label:([^=]+)=([^,]+)
target_label: ${1}
replacement: ${2}
- job_name: service-z
tls_config:

0
config/testdata/relabel_target_label.good.yml vendored

Loading…
Cancel
Save