From a1eaa6b8c5ed08eab507da06015abe3fbf0cc309 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Thu, 29 Jun 2017 16:23:10 -0700 Subject: [PATCH] Metrics id -> container_id Make sure we use container id as the id saved in the metrics labels Signed-off-by: Michael Crosby --- metrics/cgroups/metric.go | 2 +- metrics/cgroups/oom.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/metrics/cgroups/metric.go b/metrics/cgroups/metric.go index 519e524f2..d1a0056e0 100644 --- a/metrics/cgroups/metric.go +++ b/metrics/cgroups/metric.go @@ -25,7 +25,7 @@ type metric struct { func (m *metric) desc(ns *metrics.Namespace) *prometheus.Desc { // the namespace label is for containerd namespaces - return ns.NewDesc(m.name, m.help, m.unit, append([]string{"id", "namespace"}, m.labels...)...) + return ns.NewDesc(m.name, m.help, m.unit, append([]string{"container_id", "namespace"}, m.labels...)...) } func (m *metric) collect(id, namespace string, stats *cgroups.Stats, ns *metrics.Namespace, ch chan<- prometheus.Metric) { diff --git a/metrics/cgroups/oom.go b/metrics/cgroups/oom.go index f38dd3e54..adfb14f7e 100644 --- a/metrics/cgroups/oom.go +++ b/metrics/cgroups/oom.go @@ -19,7 +19,7 @@ func NewOOMCollector(ns *metrics.Namespace) (*OOMCollector, error) { } c := &OOMCollector{ fd: fd, - memoryOOM: ns.NewLabeledGauge("memory_oom", "The number of times a container received an oom event", metrics.Total, "id", "namespace"), + memoryOOM: ns.NewLabeledGauge("memory_oom", "The number of times a container received an oom event", metrics.Total, "container_id", "namespace"), set: make(map[uintptr]*oom), } go c.start()