Skip to content

memory: Add support for active_anon and inactive_anon #3750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

memory: Add support for active_anon and inactive_anon #3750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions container/libcontainer/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,20 @@ func setMemoryStats(s *cgroups.Stats, ret *info.ContainerStats) {
ret.Memory.HierarchicalData.Pgmajfault = v
}

inactiveAnonKeyName := "total_inactive_anon"
activeAnonKeyName := "total_active_anon"
if cgroups.IsCgroup2UnifiedMode() {
inactiveAnonKeyName = "inactive_anon"
activeAnonKeyName = "active_anon"
}

if v, ok := s.MemoryStats.Stats[activeAnonKeyName]; ok {
ret.Memory.TotalActiveAnon = v
}
if v, ok := s.MemoryStats.Stats[inactiveAnonKeyName]; ok {
ret.Memory.TotalInactiveAnon = v
}

inactiveFileKeyName := "total_inactive_file"
if cgroups.IsCgroup2UnifiedMode() {
inactiveFileKeyName = "inactive_file"
Expand Down
8 changes: 8 additions & 0 deletions info/v1/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,14 @@ type MemoryStats struct {
// Units: Bytes.
TotalInactiveFile uint64 `json:"total_inactive_file"`

// The total amount of active anonymous memory.
// Units: Bytes.
TotalActiveAnon uint64 `json:"total_active_anon"`

// The total amount of inactive anonymous memory.
// Units: Bytes.
TotalInactiveAnon uint64 `json:"total_inactive_anon"`

Failcnt uint64 `json:"failcnt"`

// Size of kernel memory allocated in bytes.
Expand Down
17 changes: 17 additions & 0 deletions metrics/prometheus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,22 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc, includedMetri
return metricValues{{value: float64(s.Memory.WorkingSet), timestamp: s.Timestamp}}
},
},
{
name: "container_memory_total_inactive_anon_bytes",
help: "Current total inactive anonymous in bytes.",
valueType: prometheus.GaugeValue,
getValues: func(s *info.ContainerStats) metricValues {
return metricValues{{value: float64(s.Memory.TotalInactiveAnon), timestamp: s.Timestamp}}
},
},
{
name: "container_memory_total_active_anon_bytes",
help: "Current total active anonymous in bytes.",
valueType: prometheus.GaugeValue,
getValues: func(s *info.ContainerStats) metricValues {
return metricValues{{value: float64(s.Memory.TotalActiveAnon), timestamp: s.Timestamp}}
},
},
{
name: "container_memory_total_active_file_bytes",
help: "Current total active file in bytes.",
Expand All @@ -459,6 +475,7 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc, includedMetri
return metricValues{{value: float64(s.Memory.TotalInactiveFile), timestamp: s.Timestamp}}
},
},

{
name: "container_memory_failures_total",
help: "Cumulative count of memory allocation failures.",
Expand Down