Merge pull request #1929 from hashmap/1900_validate_relabel_conf

Forbid invalid relabel configurations
This commit is contained in:
Tobias Schmidt 2016-08-29 17:45:05 +02:00 committed by GitHub
commit bc1178bf70
4 changed files with 19 additions and 0 deletions

View File

@ -963,6 +963,9 @@ func (c *RelabelConfig) UnmarshalYAML(unmarshal func(interface{}) error) error {
if c.Modulus == 0 && c.Action == RelabelHashMod { if c.Modulus == 0 && c.Action == RelabelHashMod {
return fmt.Errorf("relabel configuration for hashmod requires non-zero modulus") return fmt.Errorf("relabel configuration for hashmod requires non-zero modulus")
} }
if (c.Action == RelabelReplace || c.Action == RelabelHashMod) && c.TargetLabel == "" {
return fmt.Errorf("relabel configuration for %s action requires 'target_label' value", c.Action)
}
return nil return nil
} }

View File

@ -397,6 +397,12 @@ var expectedErrors = []struct {
}, { }, {
filename: "url_in_targetgroup.bad.yml", filename: "url_in_targetgroup.bad.yml",
errMsg: "\"http://bad\" is not a valid hostname", errMsg: "\"http://bad\" is not a valid hostname",
}, {
filename: "target_label_missing.bad.yml",
errMsg: "relabel configuration for replace action requires 'target_label' value",
}, {
filename: "target_label_hashmod_missing.bad.yml",
errMsg: "relabel configuration for hashmod action requires 'target_label' value",
}, },
} }

View File

@ -0,0 +1,6 @@
scrape_configs:
- job_name: prometheus
relabel_configs:
- source_labels: [__address__]
modulus: 8
action: hashmod

View File

@ -0,0 +1,4 @@
scrape_configs:
- job_name: prometheus
relabel_configs:
- regex: abcdef