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

Merge pull request #1384 from prometheus/scraperef 

Restrict scrape timeout to interval length
pull/1366/merge
Brian Brazil 2016-02-12 12:00:19 +00:00
parent abeeebeed4 e26e4b6e89
commit 738e6f41d4
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config.go
View File

@ -266,6 +266,9 @@ func (c *Config) UnmarshalYAML(unmarshal func(interface{}) error) error {
if scfg.ScrapeTimeout == 0 { if scfg.ScrapeTimeout == 0 {
scfg.ScrapeTimeout = c.GlobalConfig.ScrapeTimeout scfg.ScrapeTimeout = c.GlobalConfig.ScrapeTimeout
} }
if scfg.ScrapeTimeout > scfg.ScrapeInterval {
return fmt.Errorf("scrape timeout greater than scrape interval for scrape config with job name %q", scfg.JobName)
}
if _, ok := jobNames[scfg.JobName]; ok { if _, ok := jobNames[scfg.JobName]; ok {
return fmt.Errorf("found multiple scrape configs with job name %q", scfg.JobName) return fmt.Errorf("found multiple scrape configs with job name %q", scfg.JobName)

3
config/config_test.go
View File

@ -335,6 +335,9 @@ var expectedErrors = []struct {
}, { }, {
filename: "jobname_dup.bad.yml", filename: "jobname_dup.bad.yml",
errMsg: `found multiple scrape configs with job name "prometheus"`, errMsg: `found multiple scrape configs with job name "prometheus"`,
}, {
filename: "scrape_interval.bad.yml",
errMsg: `scrape timeout greater than scrape interval`,
}, { }, {
filename: "labelname.bad.yml", filename: "labelname.bad.yml",
errMsg: `"not$allowed" is not a valid label name`, errMsg: `"not$allowed" is not a valid label name`,

4
config/testdata/scrape_interval.bad.yml vendored Normal file
View File

@ -0,0 +1,4 @@
scrape_configs:
- job_name: prometheus
scrape_interval: 5s
scrape_timeout: 6s