github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #983 from prometheus/tmp-hash 

config: Update tests/examples to use __tmp_
pull/984/head
Fabian Reinartz 2015-08-13 11:46:45 +02:00
parent 697347ffaf 43449b0581
commit 4070232802
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config_test.go
View File

@ -120,13 +120,13 @@ var expectedConf = &Config{
}, },
{ {
SourceLabels: clientmodel.LabelNames{"__address__"}, SourceLabels: clientmodel.LabelNames{"__address__"},
TargetLabel: "__hash", TargetLabel: "__tmp_hash",
Modulus: 8, Modulus: 8,
Separator: ";", Separator: ";",
Action: RelabelHashMod, Action: RelabelHashMod,
}, },
{ {
SourceLabels: clientmodel.LabelNames{"__hash"}, SourceLabels: clientmodel.LabelNames{"__tmp_hash"},
Regex: &Regexp{*regexp.MustCompile("^1$")}, Regex: &Regexp{*regexp.MustCompile("^1$")},
Separator: ";", Separator: ";",
Action: RelabelKeep, Action: RelabelKeep,

4
config/testdata/conf.good.yml vendored
View File

@ -75,9 +75,9 @@ scrape_configs:
action: drop action: drop
- source_labels: [__address__] - source_labels: [__address__]
modulus: 8 modulus: 8
target_label: __hash target_label: __tmp_hash
action: hashmod action: hashmod
- source_labels: [__hash] - source_labels: [__tmp_hash]
regex: ^1$ regex: ^1$
action: keep action: keep