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

Procstat input plugin should use the same timestamp in all metrics in the same Gather() cycle. (#8658)

This commit is contained in:
David Bennett 2021-01-12 17:59:13 -05:00 committed by GitHub
parent baa658a4bb
commit 70d2b1f790
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/inputs/procstat/procstat.go
View File

@ -118,6 +118,8 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
} }
pids, tags, err := p.findPids(acc) pids, tags, err := p.findPids(acc)
now := time.Now()
if err != nil { if err != nil {
fields := map[string]interface{}{ fields := map[string]interface{}{
"pid_count": 0, "pid_count": 0,
@ -128,7 +130,7 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
"pid_finder": p.PidFinder, "pid_finder": p.PidFinder,
"result": "lookup_error", "result": "lookup_error",
} }
acc.AddFields("procstat_lookup", fields, tags) acc.AddFields("procstat_lookup", fields, tags, now)
return err return err
} }
@ -140,7 +142,7 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
p.procs = procs p.procs = procs
for _, proc := range p.procs { for _, proc := range p.procs {
p.addMetric(proc, acc) p.addMetric(proc, acc, now)
} }
fields := map[string]interface{}{ fields := map[string]interface{}{
@ -150,13 +152,13 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
} }
tags["pid_finder"] = p.PidFinder tags["pid_finder"] = p.PidFinder
tags["result"] = "success" tags["result"] = "success"
acc.AddFields("procstat_lookup", fields, tags) acc.AddFields("procstat_lookup", fields, tags, now)
return nil return nil
} }
// Add metrics a single Process // Add metrics a single Process
func (p *Procstat) addMetric(proc Process, acc telegraf.Accumulator) { func (p *Procstat) addMetric(proc Process, acc telegraf.Accumulator, t time.Time) {
var prefix string var prefix string
if p.Prefix != "" { if p.Prefix != "" {
prefix = p.Prefix + "_" prefix = p.Prefix + "_"
@ -309,7 +311,7 @@ func (p *Procstat) addMetric(proc Process, acc telegraf.Accumulator) {
} }
} }
acc.AddFields("procstat", fields, proc.Tags()) acc.AddFields("procstat", fields, proc.Tags(), t)
} }
// Update monitored Processes // Update monitored Processes

17
plugins/inputs/procstat/procstat_test.go
View File

@ -402,3 +402,20 @@ func TestProcstatLookupMetric(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, len(p.procs)+1, len(acc.Metrics)) require.Equal(t, len(p.procs)+1, len(acc.Metrics))
} }
func TestGather_SameTimestamps(t *testing.T) {
var acc testutil.Accumulator
pidfile := "/path/to/pidfile"
p := Procstat{
PidFile: pidfile,
createPIDFinder: pidFinder([]PID{pid}, nil),
createProcess: newTestProc,
}
require.NoError(t, acc.GatherError(p.Gather))
procstat, _ := acc.Get("procstat")
procstat_lookup, _ := acc.Get("procstat_lookup")
require.Equal(t, procstat.Time, procstat_lookup.Time)
}