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

feat(inputs.cgroup): Added support for cpu.stat (#12798)

This commit is contained in:
an0nfunc 2023-03-07 09:42:53 +01:00 committed by GitHub
parent 3693368a55
commit 69d9a4322f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/inputs/cgroup/cgroup_linux.go
View File

@ -172,7 +172,7 @@ type fileFormat struct {
parser func(measurement string, fields map[string]interface{}, b []byte)
}
const keyPattern = "[[:alnum:]:_]+"
const keyPattern = "[[:alnum:]:_.]+"
const valuePattern = "[\\d-]+"
var fileFormats = [...]fileFormat{

17
plugins/inputs/cgroup/cgroup_test.go
View File

@ -59,7 +59,10 @@ func TestCgroupStatistics_2(t *testing.T) {
var cg = &CGroup{
Paths: []string{"testdata/cpu"},
Files: []string{"cpuacct.usage_percpu"},
Files: []string{
"cpuacct.usage_percpu",
"cpu.stat",
},
}
require.NoError(t, acc.GatherError(cg.Gather))
@ -70,10 +73,14 @@ func TestCgroupStatistics_2(t *testing.T) {
"path": "testdata/cpu",
},
map[string]interface{}{
"cpuacct.usage_percpu.0": int64(-1452543795404),
"cpuacct.usage_percpu.1": int64(1376681271659),
"cpuacct.usage_percpu.2": int64(1450950799997),
"cpuacct.usage_percpu.3": int64(-1473113374257),
"cpu.stat.core_sched.force_idle_usec": int64(0),
"cpu.stat.system_usec": int64(103537582650),
"cpu.stat.usage_usec": int64(614953149468),
"cpu.stat.user_usec": int64(511415566817),
"cpuacct.usage_percpu.0": int64(-1452543795404),
"cpuacct.usage_percpu.1": int64(1376681271659),
"cpuacct.usage_percpu.2": int64(1450950799997),
"cpuacct.usage_percpu.3": int64(-1473113374257),
},
time.Unix(0, 0),
),

4
plugins/inputs/cgroup/testdata/cpu/cpu.stat vendored Normal file
View File

@ -0,0 +1,4 @@
usage_usec 614953149468
user_usec 511415566817
system_usec 103537582650
core_sched.force_idle_usec 0