Skip to content

feat(agent): Add memory page fault metric #226

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: main
Choose a base branch
from
Open

feat(agent): Add memory page fault metric #226

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
24 changes: 15 additions & 9 deletions cgroup/memory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import (
const maxMemory = 1 << 62

type MemoryStat struct {
RSS uint64
Cache uint64
Limit uint64
RSS uint64
Cache uint64
Limit uint64
PgFault uint64
PgMajFault uint64
}

func (cg *Cgroup) MemoryStat() *MemoryStat {
Expand Down Expand Up @@ -48,9 +50,11 @@ func (cg *Cgroup) memoryStatV1() (*MemoryStat, error) {
// mapped_file is accounted only when the memory cgroup is owner of page
// cache.)
return &MemoryStat{
RSS: vars["rss"] + vars["mapped_file"],
Cache: vars["cache"],
Limit: limit,
RSS: vars["rss"] + vars["mapped_file"],
Cache: vars["cache"],
Limit: limit,
PgFault: vars["pgfault"],
PgMajFault: vars["pgmajfault"],
}, nil
}

Expand All @@ -64,8 +68,10 @@ func (cg *Cgroup) memoryStatV2() (*MemoryStat, error) {
}
limit, _ := common.ReadUintFromFile(path.Join(cg2Root, cg.subsystems[""], "memory.max"))
return &MemoryStat{
RSS: vars["anon"] + vars["file_mapped"],
Cache: vars["file"],
Limit: limit,
RSS: vars["anon"] + vars["file_mapped"],
Cache: vars["file"],
Limit: limit,
PgFault: vars["pgfault"],
PgMajFault: vars["pgmajfault"],
}, nil
}
4 changes: 4 additions & 0 deletions containers/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,10 @@ func (c *Container) Collect(ch chan<- prometheus.Metric) {
if s.Limit > 0 {
ch <- gauge(metrics.MemoryLimit, float64(s.Limit))
}
if s.PgFault > 0 {
ch <- counter(metrics.MemoryPageFaults, float64(s.PgMajFault), "major")
ch <- counter(metrics.MemoryPageFaults, float64(s.PgFault-s.PgMajFault), "minor")
}
}

if c.oomKills > 0 {
Expand Down
18 changes: 10 additions & 8 deletions containers/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ var metrics = struct {
CPUDelay *prometheus.Desc
ThrottledTime *prometheus.Desc

MemoryLimit *prometheus.Desc
MemoryRss *prometheus.Desc
MemoryCache *prometheus.Desc
OOMKills *prometheus.Desc
MemoryLimit *prometheus.Desc
MemoryRss *prometheus.Desc
MemoryCache *prometheus.Desc
OOMKills *prometheus.Desc
MemoryPageFaults *prometheus.Desc

DiskDelay *prometheus.Desc
DiskSize *prometheus.Desc
Expand Down Expand Up @@ -65,10 +66,11 @@ var metrics = struct {
CPUDelay: metric("container_resources_cpu_delay_seconds_total", "Total time duration processes of the container have been waiting for a CPU (while being runnable)"),
ThrottledTime: metric("container_resources_cpu_throttled_seconds_total", "Total time duration the container has been throttled"),

MemoryLimit: metric("container_resources_memory_limit_bytes", "Memory limit of the container"),
MemoryRss: metric("container_resources_memory_rss_bytes", "Amount of physical memory used by the container (doesn't include page cache)"),
MemoryCache: metric("container_resources_memory_cache_bytes", "Amount of page cache memory allocated by the container"),
OOMKills: metric("container_oom_kills_total", "Total number of times the container was terminated by the OOM killer"),
MemoryLimit: metric("container_resources_memory_limit_bytes", "Memory limit of the container"),
MemoryRss: metric("container_resources_memory_rss_bytes", "Amount of physical memory used by the container (doesn't include page cache)"),
MemoryCache: metric("container_resources_memory_cache_bytes", "Amount of page cache memory allocated by the container"),
OOMKills: metric("container_oom_kills_total", "Total number of times the container was terminated by the OOM killer"),
MemoryPageFaults: metric("container_resources_memory_page_faults_total", "Total number of page faults by the container", "type"),

DiskDelay: metric("container_resources_disk_delay_seconds_total", "Total time duration processes of the container have been waiting fot I/Os to complete"),
DiskSize: metric("container_resources_disk_size_bytes", "Total capacity of the volume", "mount_point", "device", "volume"),
Expand Down