diff --git a/plugins/inputs/cgroup/README.md b/plugins/inputs/cgroup/README.md index e62c9b15e..55fac8793 100644 --- a/plugins/inputs/cgroup/README.md +++ b/plugins/inputs/cgroup/README.md @@ -43,20 +43,30 @@ All measurements have the following tags: ### Configuration: -``` +```toml # [[inputs.cgroup]] # paths = [ - # "/cgroup/memory", # root cgroup - # "/cgroup/memory/child1", # container cgroup - # "/cgroup/memory/child2/*", # all children cgroups under child2, but not child2 itself + # "/sys/fs/cgroup/memory", # root cgroup + # "/sys/fs/cgroup/memory/child1", # container cgroup + # "/sys/fs/cgroup/memory/child2/*", # all children cgroups under child2, but not child2 itself # ] # files = ["memory.*usage*", "memory.limit_in_bytes"] +``` + +### usage examples: + +```toml +# [[inputs.cgroup]] + # paths = [ + # "/sys/fs/cgroup/cpu", # root cgroup + # "/sys/fs/cgroup/cpu/*", # all container cgroups + # "/sys/fs/cgroup/cpu/*/*", # all children cgroups under each container cgroup + # ] + # files = ["cpuacct.usage", "cpu.cfs_period_us", "cpu.cfs_quota_us"] # [[inputs.cgroup]] # paths = [ - # "/cgroup/cpu", # root cgroup - # "/cgroup/cpu/*", # all container cgroups - # "/cgroup/cpu/*/*", # all children cgroups under each container cgroup + # "/sys/fs/cgroup/unified/*", # root cgroup # ] - # files = ["cpuacct.usage", "cpu.cfs_period_us", "cpu.cfs_quota_us"] + # files = ["*"] ``` diff --git a/plugins/inputs/cgroup/cgroup.go b/plugins/inputs/cgroup/cgroup.go index cc5e4b496..f3853a9da 100644 --- a/plugins/inputs/cgroup/cgroup.go +++ b/plugins/inputs/cgroup/cgroup.go @@ -16,9 +16,9 @@ var sampleConfig = ` ## want to monitor if you have a large number of cgroups, to avoid ## any cardinality issues. # paths = [ - # "/cgroup/memory", - # "/cgroup/memory/child1", - # "/cgroup/memory/child2/*", + # "/sys/fs/cgroup/memory", + # "/sys/fs/cgroup/memory/child1", + # "/sys/fs/cgroup/memory/child2/*", # ] ## cgroup stat fields, as file names, globs are supported. ## these file names are appended to each path from above.