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

update description of memory usage

Browse Source
This commit is contained in:
David Ashpole 2017-09-20 11:08:16 -07:00
parent ba91527651
commit 1dcd0cee2b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
metrics/prometheus.go
View File

@ -226,7 +226,7 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc) *PrometheusCo
}, },
}, { }, {
name: "container_memory_usage_bytes", name: "container_memory_usage_bytes",
help: "Current memory usage in bytes.", help: "Current memory usage in bytes, including all memory regardless of when it was accessed",
valueType: prometheus.GaugeValue, valueType: prometheus.GaugeValue,
getValues: func(s *info.ContainerStats) metricValues { getValues: func(s *info.ContainerStats) metricValues {
return metricValues{{value: float64(s.Memory.Usage)}} return metricValues{{value: float64(s.Memory.Usage)}}

2
metrics/testdata/prometheus_metrics vendored
View File

@ -106,7 +106,7 @@ container_memory_rss{container_env_foo_env="prod",container_label_foo_label="bar
# HELP container_memory_swap Container swap usage in bytes. # HELP container_memory_swap Container swap usage in bytes.
# TYPE container_memory_swap gauge # 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 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, including all memory regardless of when it was accessed
# 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
# HELP container_memory_working_set_bytes Current working set in bytes. # HELP container_memory_working_set_bytes Current working set in bytes.