From 1dcd0cee2b05590a8b5515f5c41a80905d2fc1c2 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Wed, 20 Sep 2017 11:08:16 -0700 Subject: [PATCH] update description of memory usage --- metrics/prometheus.go | 2 +- metrics/testdata/prometheus_metrics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metrics/prometheus.go b/metrics/prometheus.go index 549b2d1f..dcd7ca05 100644 --- a/metrics/prometheus.go +++ b/metrics/prometheus.go @@ -226,7 +226,7 @@ func NewPrometheusCollector(i infoProvider, f ContainerLabelsFunc) *PrometheusCo }, }, { 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, getValues: func(s *info.ContainerStats) metricValues { return metricValues{{value: float64(s.Memory.Usage)}} diff --git a/metrics/testdata/prometheus_metrics b/metrics/testdata/prometheus_metrics index 2f588567..e47c1324 100644 --- a/metrics/testdata/prometheus_metrics +++ b/metrics/testdata/prometheus_metrics @@ -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. # 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, including all memory regardless of when it was accessed # 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 # HELP container_memory_working_set_bytes Current working set in bytes.