From 3539e89af2aa1391e7930d401f903b53b85d92e4 Mon Sep 17 00:00:00 2001
From: Elana Hashman <ehashman@twosigma.com>
Date: Fri, 14 Sep 2018 16:07:33 -0400
Subject: [PATCH] Rename labels to match instrumentation guidelines

For the next release, we include both sets of labels for pods and
containers: "container_name" and "container", "pod_name" and "pod".
In future releases, the "*_name" metrics will be deprecated.
---
 pkg/kubelet/prober/prober_manager.go | 8 +++++++-
 pkg/kubelet/prober/worker.go         | 2 ++
 pkg/kubelet/server/server.go         | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkg/kubelet/prober/prober_manager.go b/pkg/kubelet/prober/prober_manager.go
index a913598ef69..62106b95dba 100644
--- a/pkg/kubelet/prober/prober_manager.go
+++ b/pkg/kubelet/prober/prober_manager.go
@@ -39,7 +39,13 @@ var ProberResults = prometheus.NewGaugeVec(
 		Name:      "probe_result",
 		Help:      "The result of a liveness or readiness probe for a container.",
 	},
-	[]string{"probe_type", "container_name", "pod_name", "namespace", "pod_uid"},
+	[]string{"probe_type",
+		"container_name",
+		"container",
+		"pod_name",
+		"pod",
+		"namespace",
+		"pod_uid"},
 )
 
 // Manager manages pod probing. It creates a probe "worker" for every container that specifies a
diff --git a/pkg/kubelet/prober/worker.go b/pkg/kubelet/prober/worker.go
index 0602419d7b6..295f7c40173 100644
--- a/pkg/kubelet/prober/worker.go
+++ b/pkg/kubelet/prober/worker.go
@@ -101,7 +101,9 @@ func newWorker(
 	w.proberResultsMetricLabels = prometheus.Labels{
 		"probe_type":     w.probeType.String(),
 		"container_name": w.container.Name,
+		"container":      w.container.Name,
 		"pod_name":       w.pod.Name,
+		"pod":            w.pod.Name,
 		"namespace":      w.pod.Namespace,
 		"pod_uid":        string(w.pod.UID),
 	}
diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go
index 50256f6e80c..9471ff32e35 100644
--- a/pkg/kubelet/server/server.go
+++ b/pkg/kubelet/server/server.go
@@ -865,8 +865,10 @@ func containerPrometheusLabelsFunc(s stats.StatsProvider) metrics.ContainerLabel
 			metrics.LabelName:  name,
 			metrics.LabelImage: image,
 			"pod_name":         podName,
+			"pod":              podName,
 			"namespace":        namespace,
 			"container_name":   containerName,
+			"container":        containerName,
 		}
 		return set
 	}