CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(outputs.prometheus): expire during add (#12160) 

fixes https://github.com/influxdata/telegraf/issues/9821
This commit is contained in:
Joshua Powers 2022-11-07 11:36:34 -07:00 committed by GitHub
parent 67d1ca0f0f
commit a1de125ace
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/outputs/prometheus_client/v1/collector.go
View File

@ -77,6 +77,8 @@ func (c *Collector) Collect(ch chan<- prometheus.Metric) {
c.Lock() c.Lock()
defer c.Unlock() defer c.Unlock()
// Expire metrics, doing this on Collect ensure metrics are removed even if no
// new metrics are added to the output.
c.Expire(time.Now(), c.ExpirationInterval) c.Expire(time.Now(), c.ExpirationInterval)
for name, family := range c.fam { for name, family := range c.fam {
@ -366,6 +368,10 @@ func (c *Collector) Add(metrics []telegraf.Metric) error {
c.addMetricFamily(point, sample, mname, sampleID) c.addMetricFamily(point, sample, mname, sampleID)
} }
} }
// Expire metrics, doing this on Add ensure metrics are removed even if no
// one is querying the data.
c.Expire(time.Now(), c.ExpirationInterval)
} }
return nil return nil
} }