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

fix(inputs.procstat): Return tags of pids if lookup_error (#13015)

This commit is contained in:
genofire 2023-04-03 20:28:50 +02:00 committed by GitHub
parent 52b3f5211f
commit 9bfe6425b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,27 +83,28 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
pidCount := 0 pidCount := 0
now := time.Now() now := time.Now()
newProcs := make(map[PID]Process, len(p.procs)) newProcs := make(map[PID]Process, len(p.procs))
tags := make(map[string]string)
pidTags := p.findPids() pidTags := p.findPids()
for _, pidTag := range pidTags { for _, pidTag := range pidTags {
pids := pidTag.PIDS pids := pidTag.PIDS
tags := pidTag.Tags
err := pidTag.Err err := pidTag.Err
pidCount += len(pids) pidCount += len(pids)
for key, value := range pidTag.Tags {
tags[key] = value
}
if err != nil { if err != nil {
fields := map[string]interface{}{ fields := map[string]interface{}{
"pid_count": 0, "pid_count": 0,
"running": 0, "running": 0,
"result_code": 1, "result_code": 1,
} }
tags := map[string]string{ tags["pid_finder"] = p.PidFinder
"pid_finder": p.PidFinder, tags["result"] = "lookup_error"
"result": "lookup_error",
}
acc.AddFields("procstat_lookup", fields, tags, now) acc.AddFields("procstat_lookup", fields, tags, now)
return err return err
} }
p.updateProcesses(pids, tags, p.procs, newProcs) p.updateProcesses(pids, pidTag.Tags, p.procs, newProcs)
} }
p.procs = newProcs p.procs = newProcs
@ -111,13 +112,6 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
p.addMetric(proc, acc, now) p.addMetric(proc, acc, now)
} }
tags := make(map[string]string)
for _, pidTag := range pidTags {
for key, value := range pidTag.Tags {
tags[key] = value
}
}
fields := map[string]interface{}{ fields := map[string]interface{}{
"pid_count": pidCount, "pid_count": pidCount,
"running": len(p.procs), "running": len(p.procs),