prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add cgropu swap usage and export as prometheus metric

Browse Source
This commit is contained in:
Florian Koch 2016-06-01 08:17:24 +02:00 committed by Florian Koch
parent b1d8f6f900
commit 3ce98a46c4
5 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
container/libcontainer/helpers.go
View File

@ -383,6 +383,7 @@ func setMemoryStats(s *cgroups.Stats, ret *info.ContainerStats) {
ret.Memory.Failcnt = s.MemoryStats.Usage.Failcnt ret.Memory.Failcnt = s.MemoryStats.Usage.Failcnt
ret.Memory.Cache = s.MemoryStats.Stats["cache"] ret.Memory.Cache = s.MemoryStats.Stats["cache"]
ret.Memory.RSS = s.MemoryStats.Stats["rss"] ret.Memory.RSS = s.MemoryStats.Stats["rss"]
ret.Memory.Swap = s.MemoryStats.Stats["swap"]
if v, ok := s.MemoryStats.Stats["pgfault"]; ok { if v, ok := s.MemoryStats.Stats["pgfault"]; ok {
ret.Memory.ContainerData.Pgfault = v ret.Memory.ContainerData.Pgfault = v
ret.Memory.HierarchicalData.Pgfault = v ret.Memory.HierarchicalData.Pgfault = v

4
info/v1/container.go
View File

@ -338,6 +338,10 @@ type MemoryStats struct {
// Units: Bytes. // Units: Bytes.
RSS uint64 `json:"rss"` RSS uint64 `json:"rss"`
// The amount of swap currently used by the processes in this cgroup
// Units: Bytes.
Swap uint64 `json:"swap"`
// The amount of working set memory, this includes recently accessed memory, // The amount of working set memory, this includes recently accessed memory,
// dirty memory, and kernel memory. Working set is <= "usage". // dirty memory, and kernel memory. Working set is <= "usage".
// Units: Bytes. // Units: Bytes.

7
metrics/prometheus.go
View File

@ -166,6 +166,13 @@ func NewPrometheusCollector(infoProvider infoProvider, f ContainerNameToLabelsFu
getValues: func(s *info.ContainerStats) metricValues { getValues: func(s *info.ContainerStats) metricValues {
return metricValues{{value: float64(s.Memory.RSS)}} return metricValues{{value: float64(s.Memory.RSS)}}
}, },
}, {
name: "container_memory_swap",
help: "Container swap usage in bytes.",
valueType: prometheus.GaugeValue,
getValues: func(s *info.ContainerStats) metricValues {
return metricValues{{value: float64(s.Memory.Swap)}}
},
}, { }, {
name: "container_memory_failcnt", name: "container_memory_failcnt",
help: "Number of memory usage hits limits", help: "Number of memory usage hits limits",

1
metrics/prometheus_test.go
View File

@ -99,6 +99,7 @@ func (p testSubcontainersInfoProvider) SubcontainersInfo(string, *info.Container
}, },
Cache: 14, Cache: 14,
RSS: 15, RSS: 15,
Swap: 8192,
}, },
Network: info.NetworkStats{ Network: info.NetworkStats{
InterfaceStats: info.InterfaceStats{ InterfaceStats: info.InterfaceStats{

3
metrics/testdata/prometheus_metrics vendored
View File

@ -92,6 +92,9 @@ container_memory_failures_total{container_env_foo_env="prod",container_label_foo
# HELP container_memory_rss Size of RSS in bytes. # HELP container_memory_rss Size of RSS in bytes.
# TYPE container_memory_rss gauge # TYPE container_memory_rss gauge
container_memory_rss{container_env_foo_env="prod",container_label_foo_label="bar",id="testcontainer",image="test",name="testcontaineralias",zone_name="hello"} 15 container_memory_rss{container_env_foo_env="prod",container_label_foo_label="bar",id="testcontainer",image="test",name="testcontaineralias",zone_name="hello"} 15
# HELP container_memory_swap Container swap usage in bytes.
# TYPE container_memory_swap gauge
container_memory_swap{container_env_foo_env="prod",container_label_foo_label="bar",id="testcontainer",image="test",name="testcontaineralias",zone_name="hello"} 8192
# HELP container_memory_usage_bytes Current memory usage in bytes. # HELP container_memory_usage_bytes Current memory usage in bytes.
# TYPE container_memory_usage_bytes gauge # TYPE container_memory_usage_bytes gauge
container_memory_usage_bytes{container_env_foo_env="prod",container_label_foo_label="bar",id="testcontainer",image="test",name="testcontaineralias",zone_name="hello"} 8 container_memory_usage_bytes{container_env_foo_env="prod",container_label_foo_label="bar",id="testcontainer",image="test",name="testcontaineralias",zone_name="hello"} 8