From 28989ed60775c0a3415fd7581d4d723c95ccb0b6 Mon Sep 17 00:00:00 2001 From: sanek9 Date: Tue, 17 Dec 2019 23:10:28 +0300 Subject: [PATCH] filtering __name__ --- collector/prometheus_collector.go | 3 +++ metrics/prometheus.go | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/collector/prometheus_collector.go b/collector/prometheus_collector.go index baad487b..54f5c6c8 100644 --- a/collector/prometheus_collector.go +++ b/collector/prometheus_collector.go @@ -187,6 +187,9 @@ func (s byName) Less(i, j int) bool { func prometheusLabelSetToCadvisorLabels(promLabels model.Metric) map[string]string { labels := make(map[string]string) for k, v := range promLabels { + if string(k) == "__name__" { + continue + } labels[string(k)] = string(v) } return labels diff --git a/metrics/prometheus.go b/metrics/prometheus.go index d32a3dda..c3044e17 100644 --- a/metrics/prometheus.go +++ b/metrics/prometheus.go @@ -1682,9 +1682,6 @@ func (c *PrometheusCollector) collectContainersInfo(ch chan<- prometheus.Metric) copy(clabels, labels) copy(cvalues, values) for label, value := range metric.Labels { - if label == "__name__" { - continue - } clabels = append(clabels, sanitizeLabelName(label)) cvalues = append(cvalues, value) }