Fixes the scrape timeout validation.

grafana · Jan 2, 2023 · 2fd3dea · 2fd3dea
1 parent 5784584
commit 2fd3dea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/agent/config.go b/pkg/agent/config.go
@@ -122,11 +122,11 @@ func (c *ScrapeConfig) Validate() error {
 	if c.JobName == "" {
 		return fmt.Errorf("job_name is empty")
 	}
-	if c.ScrapeTimeout > c.ScrapeInterval {
-		return fmt.Errorf("scrape timeout must be larger or equal to inverval for: %v", c.JobName)
-	}
 	if c.ScrapeTimeout == 0 {
-		c.ScrapeTimeout = c.ScrapeInterval
+		c.ScrapeTimeout = c.ScrapeInterval + model.Duration(3*time.Second)
+	}
+	if c.ScrapeTimeout <= c.ScrapeInterval {
+		return fmt.Errorf("scrape timeout must be larger or equal to inverval for: %v", c.JobName)
 	}
 
 	if cfg, ok := c.ProfilingConfig.PprofConfig[pprofProcessCPU]; ok {

diff --git a/pkg/agent/profiles.go b/pkg/agent/profiles.go
@@ -228,7 +228,7 @@ func (tg *TargetGroup) targetsFromGroup(group *targetgroup.Group) ([]*Target, []
 				}
 
 				if pcfg, found := tg.config.ProfilingConfig.PprofConfig[profType]; found && pcfg.Delta {
-					params.Add("seconds", strconv.Itoa(int(time.Duration(tg.config.ScrapeTimeout)/time.Second)-1))
+					params.Add("seconds", strconv.Itoa(int(time.Duration(tg.config.ScrapeInterval)/time.Second)))
 				}
 				targets = append(targets, &Target{
 					Target:               scrape.NewTarget(lbls, origLabels, params),