Merge pull request #1858 from dashpole/changelog_v0.27.4

Changelog v0.27.4 and cherry-pick #1830
google · Jan 9, 2018 · 492322b · 492322b
2 parents 1f82310 + 6842d38
commit 492322b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### 0.27.4 (2018-01-09)
+- Add timeout to docker API Calls
+- Fix inconsistent Prometheus labels
+
 ### 0.27.3 (2017-11-22)
 - Update Jquery and Bootstrap
 

diff --git a/metrics/prometheus.go b/metrics/prometheus.go
@@ -767,11 +767,19 @@ func (c *PrometheusCollector) collectContainersInfo(ch chan<- prometheus.Metric)
 		glog.Warningf("Couldn't get containers: %s", err)
 		return
 	}
+	rawLabels := map[string]struct{}{}
 	for _, container := range containers {
-		labels, values := []string{}, []string{}
-		for l, v := range c.containerLabelsFunc(container) {
+		for l := range c.containerLabelsFunc(container) {
+			rawLabels[l] = struct{}{}
+		}
+	}
+	for _, container := range containers {
+		values := make([]string, 0, len(rawLabels))
+		labels := make([]string, 0, len(rawLabels))
+		containerLabels := c.containerLabelsFunc(container)
+		for l := range rawLabels {
 			labels = append(labels, sanitizeLabelName(l))
-			values = append(values, v)
+			values = append(values, containerLabels[l])
 		}
 
 		// Container spec