Restore linkerd.io/control-plane* labels (#1411)

Signed-off-by: Kevin Lingerfelt <kl@buoyant.io>

cli/cmd/testdata/install_default.golden

@@ -617,6 +617,10 @@ data:
       # drop all labels that we just made copies of in the previous labelmap
       - action: labeldrop
         regex: __meta_kubernetes_pod_label_linkerd_io_proxy_(.+)
+      # __meta_kubernetes_pod_label_linkerd_io_foo=bar =>
+      # foo=bar
+      - action: labelmap
+        regex: __meta_kubernetes_pod_label_linkerd_io_(.+)
 
 ### Grafana ###
 ---

cli/cmd/testdata/install_output.golden

@@ -620,6 +620,10 @@ data:
       # drop all labels that we just made copies of in the previous labelmap
       - action: labeldrop
         regex: __meta_kubernetes_pod_label_linkerd_io_proxy_(.+)
+      # __meta_kubernetes_pod_label_linkerd_io_foo=bar =>
+      # foo=bar
+      - action: labelmap
+        regex: __meta_kubernetes_pod_label_linkerd_io_(.+)
 
 ### Grafana ###
 ---

cli/install/template.go

@@ -443,6 +443,10 @@ data:
       # drop all labels that we just made copies of in the previous labelmap
       - action: labeldrop
         regex: __meta_kubernetes_pod_label_linkerd_io_proxy_(.+)
+      # __meta_kubernetes_pod_label_linkerd_io_foo=bar =>
+      # foo=bar
+      - action: labelmap
+        regex: __meta_kubernetes_pod_label_linkerd_io_(.+)
 
 ### Grafana ###
 ---

doc/prometheus.md

@@ -33,8 +33,9 @@ rich telemetry data to your cluster.  Simply add the following item to your
       - source_labels:
         - __meta_kubernetes_pod_container_name
         - __meta_kubernetes_pod_container_port_name
+        - __meta_kubernetes_pod_label_linkerd_io_control_plane_ns
         action: keep
-        regex: ^linkerd-proxy;linkerd-metrics$
+        regex: ^linkerd-proxy;linkerd-metrics;linkerd$
       - source_labels: [__meta_kubernetes_namespace]
         action: replace
         target_label: namespace
@@ -55,9 +56,10 @@ rich telemetry data to your cluster.  Simply add the following item to your
       # drop all labels that we just made copies of in the previous labelmap
       - action: labeldrop
         regex: __meta_kubernetes_pod_label_linkerd_io_proxy_(.+)
-      # __meta_kubernetes_pod_label_foo=bar => foo=bar
+      # __meta_kubernetes_pod_label_linkerd_io_foo=bar =>
+      # foo=bar
       - action: labelmap
-        regex: __meta_kubernetes_pod_label_(.+)
+        regex: __meta_kubernetes_pod_label_linkerd_io_(.+)
 ```
 
 That's it!  Your Prometheus cluster is now configured to scrape Linkerd's

doc/proxy-metrics.md

@@ -133,7 +133,7 @@ request_total{
   pod="vote-bot-5b7f5657f6-xbjjw",
   namespace="emojivoto",
   app="vote-bot",
-  linkerd_io_control_plane_ns="linkerd",
+  control_plane_ns="linkerd",
   deployment="vote-bot",
   pod_template_hash="3957278789",
   test="vote-bot-test",

grafana/dashboards/health.json

@@ -71,14 +71,14 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "process_virtual_memory_bytes{linkerd_io_control_plane_ns=\"$namespace\", job=\"linkerd-proxy\"}",
+          "expr": "process_virtual_memory_bytes{control_plane_ns=\"$namespace\", job=\"linkerd-proxy\"}",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{namespace}}/{{pod}}/virtual",
           "refId": "A"
         },
         {
-          "expr": "process_resident_memory_bytes{linkerd_io_control_plane_ns=\"$namespace\", job=\"linkerd-proxy\"}",
+          "expr": "process_resident_memory_bytes{control_plane_ns=\"$namespace\", job=\"linkerd-proxy\"}",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{namespace}}/{{pod}}/resident",
@@ -162,7 +162,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "sum(irate(process_cpu_seconds_total{linkerd_io_control_plane_ns=\"$namespace\", job=\"linkerd-proxy\"}[20s])) by (namespace, pod)",
+          "expr": "sum(irate(process_cpu_seconds_total{control_plane_ns=\"$namespace\", job=\"linkerd-proxy\"}[20s])) by (namespace, pod)",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{namespace}}/{{pod}}",
@@ -246,7 +246,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "process_open_fds{linkerd_io_control_plane_ns=\"$namespace\", job=\"linkerd-proxy\"}",
+          "expr": "process_open_fds{control_plane_ns=\"$namespace\", job=\"linkerd-proxy\"}",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{namespace}}/{{pod}}",
@@ -1699,7 +1699,7 @@
         "multi": false,
         "name": "deployment",
         "options": [],
-        "query": "label_values(request_total{linkerd_io_control_plane_component!=\"\"}, deployment)",
+        "query": "label_values(request_total{control_plane_component!=\"\"}, deployment)",
         "refresh": 2,
         "regex": "",
         "sort": 1,
@@ -1739,7 +1739,7 @@
         "multi": false,
         "name": "namespace",
         "options": [],
-        "query": "label_values(request_total{linkerd_io_control_plane_ns!=\"\"},  linkerd_io_control_plane_ns)",
+        "query": "label_values(request_total{control_plane_ns!=\"\"},  control_plane_ns)",
         "refresh": 2,
         "regex": "",
         "sort": 0,

pkg/k8s/labels.go

@@ -94,7 +94,7 @@ func GetPodLabels(ownerKind, ownerName string, pod *coreV1.Pod) map[string]strin
 	}
 
 	if controllerNS := pod.Labels[ControllerNSLabel]; controllerNS != "" {
-		labels["linkerd_io_control_plane_ns"] = controllerNS
+		labels["control_plane_ns"] = controllerNS
 	}
 
 	if pth := pod.Labels[appsV1.DefaultDeploymentUniqueLabelKey]; pth != "" {

pkg/k8s/labels_test.go

@@ -25,10 +25,10 @@ func TestGetPodLabels(t *testing.T) {
 		ownerName := "test-deployment"
 
 		expectedLabels := map[string]string{
-			"linkerd_io_control_plane_ns": "linkerd-namespace",
-			"deployment":                  "test-deployment",
-			"pod":                         "test-pod",
-			"pod_template_hash":           "test-pth",
+			"control_plane_ns":  "linkerd-namespace",
+			"deployment":        "test-deployment",
+			"pod":               "test-pod",
+			"pod_template_hash": "test-pth",
 		}
 
 		podLabels := GetPodLabels(ownerKind, ownerName, pod)