mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-10 15:44:05 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #892 from prometheus/fabxc/cfgfix

Browse source 
config: add overflow detection for serverset config
This commit is contained in:
Fabian Reinartz 2015-07-14 14:50:26 +02:00
parent 1c25247a75 435fc7234f
commit 0834bd03b5
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/config.go
View file

@ -428,6 +428,9 @@ type ServersetSDConfig struct {
Servers []string `yaml:"servers"`
Paths []string `yaml:"paths"`
Timeout Duration `yaml:"timeout,omitempty"`
// Catches all undefined fields and must be empty after parsing.
XXX map[string]interface{} `yaml:",inline"`
}
// UnmarshalYAML implements the yaml.Unmarshaler interface.
@ -449,7 +452,7 @@ func (c *ServersetSDConfig) UnmarshalYAML(unmarshal func(interface{}) error) err
return fmt.Errorf("serverset SD config paths must begin with '/': %s", path)
}
}
return nil
return checkOverflow(c.XXX, "serverset_sd_config")
}
// RelabelAction is the action to be performed on relabeling.