p17860254
/
categraf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

split memstats to basic and extend

This commit is contained in:
Ulric Qin 2022-06-07 23:15:05 +08:00
parent 98a5b61f6c
commit d8eb2d9ce3
2 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/input.docker/docker.toml
View File

@ -15,6 +15,7 @@ endpoint = "unix:///var/run/docker.sock"
## Set to true to collect Swarm metrics(desired_replicas, running_replicas)
gather_services = false
gather_extend_memstats = false
container_id_label_enable = true
container_id_label_short_style = true

66
inputs/docker/docker.go
View File

@ -105,6 +105,7 @@ type Instance struct {
Endpoint string `toml:"endpoint"`
GatherServices bool `toml:"gather_services"`
GatherExtendMemstats bool `toml:"gather_extend_memstats"`
ContainerIDLabelEnable bool `toml:"container_id_label_enable"`
ContainerIDLabelShortStyle bool `toml:"container_id_label_short_style"`
PerDeviceInclude []string `toml:"perdevice_include"`
@ -353,46 +354,57 @@ func (ins *Instance) gatherContainerInspect(container types.Container, slist *li
func (ins *Instance) parseContainerStats(stat *types.StatsJSON, slist *list.SafeList, tags map[string]string, ostype string) {
// memory
memstats := []string{
// "active_anon",
// "active_file",
basicMemstats := []string{
"cache",
// "hierarchical_memory_limit",
// "inactive_anon",
// "inactive_file",
// "mapped_file",
// "pgfault",
// "pgmajfault",
// "pgpgin",
// "pgpgout",
"rss",
// "rss_huge",
// "total_active_anon",
// "total_active_file",
"total_cache",
// "total_inactive_anon",
// "total_inactive_file",
// "total_mapped_file",
// "total_pgfault",
// "total_pgmajfault",
// "total_pgpgin",
// "total_pgpgout",
"total_rss",
// "total_rss_huge",
// "total_unevictable",
// "total_writeback",
// "unevictable",
// "writeback",
}
extendMemstats := []string{
"active_anon",
"active_file",
"hierarchical_memory_limit",
"inactive_anon",
"inactive_file",
"mapped_file",
"pgfault",
"pgmajfault",
"pgpgin",
"pgpgout",
"rss_huge",
"total_active_anon",
"total_active_file",
"total_inactive_anon",
"total_inactive_file",
"total_mapped_file",
"total_pgfault",
"total_pgmajfault",
"total_pgpgin",
"total_pgpgout",
"total_rss_huge",
"total_unevictable",
"total_writeback",
"unevictable",
"writeback",
}
memfields := map[string]interface{}{}
for _, field := range memstats {
for _, field := range basicMemstats {
if value, ok := stat.MemoryStats.Stats[field]; ok {
memfields["docker_container_mem_"+field] = value
}
}
if ins.GatherExtendMemstats {
for _, field := range extendMemstats {
if value, ok := stat.MemoryStats.Stats[field]; ok {
memfields["docker_container_mem_"+field] = value
}
}
}
if stat.MemoryStats.Failcnt != 0 {
memfields["docker_container_mem_fail_count"] = stat.MemoryStats.Failcnt
}