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

fix(inputs.procstat): Correctly set tags on procstat_lookup (#14493)

This commit is contained in:
Joshua Powers 2024-01-02 04:32:21 -07:00 committed by GitHub
parent 19347bfe6b
commit 681e386bd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,6 +146,11 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
"pid_finder": p.PidFinder, "pid_finder": p.PidFinder,
"result": "lookup_error", "result": "lookup_error",
} }
for _, pidTag := range results {
for key, value := range pidTag.Tags {
tags[key] = value
}
}
acc.AddFields("procstat_lookup", fields, tags, now) acc.AddFields("procstat_lookup", fields, tags, now)
return err return err
} }
@ -208,6 +213,11 @@ func (p *Procstat) Gather(acc telegraf.Accumulator) error {
"pid_finder": p.PidFinder, "pid_finder": p.PidFinder,
"result": "success", "result": "success",
} }
for _, pidTag := range results {
for key, value := range pidTag.Tags {
tags[key] = value
}
}
if len(p.SupervisorUnits) > 0 { if len(p.SupervisorUnits) > 0 {
tags["supervisor_unit"] = strings.Join(p.SupervisorUnits, ";") tags["supervisor_unit"] = strings.Join(p.SupervisorUnits, ";")
} }

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

@ -245,6 +245,24 @@ func TestInitMissingPidMethod(t *testing.T) {
} }
func TestGather_CreateProcessErrorOk(t *testing.T) { func TestGather_CreateProcessErrorOk(t *testing.T) {
expected := []telegraf.Metric{
testutil.MustMetric(
"procstat_lookup",
map[string]string{
"exe": "foo",
"pid_finder": "test",
"result": "success",
},
map[string]interface{}{
"pid_count": int64(1),
"result_code": int64(0),
"running": int64(0),
},
time.Unix(0, 0),
telegraf.Untyped,
),
}
p := Procstat{ p := Procstat{
Exe: exe, Exe: exe,
PidFinder: "test", PidFinder: "test",
@ -258,9 +276,64 @@ func TestGather_CreateProcessErrorOk(t *testing.T) {
var acc testutil.Accumulator var acc testutil.Accumulator
require.NoError(t, p.Gather(&acc)) require.NoError(t, p.Gather(&acc))
testutil.RequireMetricsEqual(t, expected, acc.GetTelegrafMetrics(), testutil.IgnoreTime())
} }
func TestGather_ProcessName(t *testing.T) { func TestGather_ProcessName(t *testing.T) {
expected := []telegraf.Metric{
testutil.MustMetric(
"procstat",
map[string]string{
"exe": "foo",
"process_name": "custom_name",
},
map[string]interface{}{
"child_major_faults": uint64(0),
"child_minor_faults": uint64(0),
"cmdline": "test_proc",
"cpu_time_iowait": float64(0),
"cpu_time_system": float64(0),
"cpu_time_user": float64(0),
"cpu_usage": float64(0),
"created_at": int64(0),
"involuntary_context_switches": int64(0),
"major_faults": uint64(0),
"memory_rss": uint64(0),
"memory_usage": float32(0),
"memory_vms": uint64(0),
"minor_faults": uint64(0),
"num_fds": int32(0),
"num_threads": int32(0),
"pid": int32(42),
"ppid": int32(0),
"read_bytes": uint64(0),
"read_count": uint64(0),
"status": "running",
"user": "testuser",
"voluntary_context_switches": int64(0),
"write_bytes": uint64(0),
"write_count": uint64(0),
},
time.Unix(0, 0),
telegraf.Untyped,
),
testutil.MustMetric(
"procstat_lookup",
map[string]string{
"exe": "foo",
"pid_finder": "test",
"result": "success",
},
map[string]interface{}{
"pid_count": int64(1),
"result_code": int64(0),
"running": int64(1),
},
time.Unix(0, 0),
telegraf.Untyped,
),
}
p := Procstat{ p := Procstat{
Exe: exe, Exe: exe,
ProcessName: "custom_name", ProcessName: "custom_name",
@ -274,7 +347,9 @@ func TestGather_ProcessName(t *testing.T) {
var acc testutil.Accumulator var acc testutil.Accumulator
require.NoError(t, p.Gather(&acc)) require.NoError(t, p.Gather(&acc))
testutil.PrintMetrics(acc.GetTelegrafMetrics())
require.Equal(t, "custom_name", acc.TagValue("procstat", "process_name")) require.Equal(t, "custom_name", acc.TagValue("procstat", "process_name"))
testutil.RequireMetricsEqual(t, expected, acc.GetTelegrafMetrics(), testutil.IgnoreTime())
} }
func TestGather_NoProcessNameUsesReal(t *testing.T) { func TestGather_NoProcessNameUsesReal(t *testing.T) {