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

Merge pull request #2904 from Gouthamve/srclbl-omitempty 

Make sure rendering config produces valid config
This commit is contained in:
Fabian Reinartz 2017-07-05 16:24:18 +02:00 committed by GitHub
parent 3ed4fea58c 98d20d5880
commit e58e7954a7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/config.go
View File

@ -1278,7 +1278,7 @@ func (a *RelabelAction) UnmarshalYAML(unmarshal func(interface{}) error) error {
type RelabelConfig struct { type RelabelConfig struct {
// A list of labels from which values are taken and concatenated // A list of labels from which values are taken and concatenated
// with the configured separator in order. // with the configured separator in order.
SourceLabels model.LabelNames `yaml:"source_labels,flow"` SourceLabels model.LabelNames `yaml:"source_labels,flow,omitempty"`
// Separator is the string between concatenated values from the source labels. // Separator is the string between concatenated values from the source labels.
Separator string `yaml:"separator,omitempty"` Separator string `yaml:"separator,omitempty"`
// Regex against which the concatenation is matched. // Regex against which the concatenation is matched.