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

Merge pull request #1102 from mjibson/allow-labelmap 

Allow labelmap action
This commit is contained in:
Julius Volz 2015-09-21 22:11:53 +02:00
parent cf12e890a6 0e99fa6c46
commit ef176e5a9b
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@ -687,7 +687,7 @@ func (a *RelabelAction) UnmarshalYAML(unmarshal func(interface{}) error) error {
return err return err
} }
switch act := RelabelAction(strings.ToLower(s)); act { switch act := RelabelAction(strings.ToLower(s)); act {
case RelabelReplace, RelabelKeep, RelabelDrop, RelabelHashMod: case RelabelReplace, RelabelKeep, RelabelDrop, RelabelHashMod, RelabelLabelMap:
*a = act *a = act
return nil return nil
} }

5
config/config_test.go
View File

@ -143,6 +143,11 @@ var expectedConf = &Config{
Separator: ";", Separator: ";",
Action: RelabelKeep, Action: RelabelKeep,
}, },
{
Regex: MustNewRegexp("1"),
Separator: ";",
Action: RelabelLabelMap,
},
}, },
MetricRelabelConfigs: []*RelabelConfig{ MetricRelabelConfigs: []*RelabelConfig{
{ {

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

@ -80,6 +80,8 @@ scrape_configs:
- source_labels: [__tmp_hash] - source_labels: [__tmp_hash]
regex: 1 regex: 1
action: keep action: keep
- action: labelmap
regex: 1
metric_relabel_configs: metric_relabel_configs:
- source_labels: [__name__] - source_labels: [__name__]