Merge pull request #832 from paulfantom/labels

jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet

@@ -51,6 +51,17 @@
         ],
       },
       replicas: 3,
+      labels: {
+        'app.kubernetes.io/name': 'alertmanager-' + $._config.alertmanager.name,
+        'app.kubernetes.io/version': $._config.versions.alertmanager,
+        'app.kubernetes.io/component': 'router',
+        'app.kubernetes.io/part-of': 'kube-prometheus',
+      },
+      selectorLabels: {
+        [labelName]: $._config.alertmanager.labels[labelName]
+        for labelName in std.objectFields($._config.alertmanager.labels)
+        if !std.setMember(labelName, ['app.kubernetes.io/version'])
+      },
     },
   },
 
@@ -87,13 +98,16 @@
       metadata: {
         name: 'alertmanager-' + $._config.alertmanager.name,
         namespace: $._config.namespace,
-        labels: { alertmanager: $._config.alertmanager.name },
+        labels: { alertmanager: $._config.alertmanager.name } + $._config.alertmanager.labels,
       },
       spec: {
         ports: [
           { name: 'web', targetPort: 'web', port: 9093 },
         ],
-        selector: { app: 'alertmanager', alertmanager: $._config.alertmanager.name },
+        selector: {
+          app: 'alertmanager',
+          alertmanager: $._config.alertmanager.name
+        } + $._config.alertmanager.selectorLabels,
         sessionAffinity: 'ClientIP',
       },
     },
@@ -104,15 +118,13 @@
       metadata: {
         name: 'alertmanager',
         namespace: $._config.namespace,
-        labels: {
+        labels: $._config.alertmanager.labels,
-          'k8s-app': 'alertmanager',
-        },
       },
       spec: {
         selector: {
           matchLabels: {
             alertmanager: $._config.alertmanager.name,
-          },
+          } + $._config.alertmanager.selectorLabels,
         },
         endpoints: [
           { port: 'web', interval: '30s' },
@@ -128,12 +140,15 @@
         namespace: $._config.namespace,
         labels: {
           alertmanager: $._config.alertmanager.name,
-        },
+        } + $._config.alertmanager.labels,
       },
       spec: {
         replicas: $._config.alertmanager.replicas,
         version: $._config.versions.alertmanager,
         image: $._config.imageRepos.alertmanager + ':' + $._config.versions.alertmanager,
+        podMetadata: {
+          labels: $._config.alertmanager.labels,
+        },
         nodeSelector: { 'kubernetes.io/os': 'linux' },
         serviceAccountName: 'alertmanager-' + $._config.alertmanager.name,
         securityContext: {

jsonnet/kube-prometheus/kube-prometheus-bootkube.libsonnet

@@ -18,24 +18,24 @@ local service(name, namespace, labels, selector, ports) = {
     kubeControllerManagerPrometheusDiscoveryService: service(
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
-      { 'k8s-app': 'kube-controller-manager' },
+      { 'app.kubernetes.io/name': 'kube-controller-manager' },
-      { 'k8s-app': 'kube-controller-manager' },
+      { 'app.kubernetes.io/name': 'kube-controller-manager' },
       [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
     ),
 
     kubeSchedulerPrometheusDiscoveryService: service(
       'kube-scheduler-prometheus-discovery',
       'kube-system',
-      { 'k8s-app': 'kube-scheduler' },
+      { 'app.kubernetes.io/name': 'kube-scheduler' },
-      { 'k8s-app': 'kube-scheduler' },
+      { 'app.kubernetes.io/name': 'kube-scheduler' },
       [{ name: 'https-metrics', port: 10259, targetPort: 10259 }]
     ),
 
     kubeDnsPrometheusDiscoveryService: service(
       'kube-dns-prometheus-discovery',
-      'kube-syste',
+      'kube-system',
-      { 'k8s-app': 'kube-dns' },
+      { 'app.kubernetes.io/name': 'kube-dns' },
-      { 'k8s-app': 'kube-dns' },
+      { 'app.kubernetes.io/name': 'kube-dns' },
       [{ name: 'http-metrics-skydns', port: 10055, targetPort: 10055 }, { name: 'http-metrics-dnsmasq', port: 10054, targetPort: 10054 }]
     ),
   },

jsonnet/kube-prometheus/kube-prometheus-eks.libsonnet

@@ -23,13 +23,13 @@
       metadata: {
         name: 'aws-node',
         namespace: 'kube-system',
-        labels: { 'k8s-app': 'aws-node' },
+        labels: { 'app.kubernetes.io/name': 'aws-node' },
       },
       spec: {
         ports: [
           { name: 'cni-metrics-port', port: 61678, targetPort: 61678 },
         ],
-        selector: { 'k8s-app': 'aws-node' },
+        selector: { 'app.kubernetes.io/name': 'aws-node' },
         clusterIP: 'None',
       },
     },
@@ -41,14 +41,14 @@
         name: 'awsekscni',
         namespace: $._config.namespace,
         labels: {
-          'k8s-app': 'eks-cni',
+          'app.kubernetes.io/name': 'eks-cni',
         },
       },
       spec: {
-        jobLabel: 'k8s-app',
+        jobLabel: 'app.kubernetes.io/name',
         selector: {
           matchLabels: {
-            'k8s-app': 'aws-node',
+            'app.kubernetes.io/name': 'aws-node',
           },
         },
         namespaceSelector: {

jsonnet/kube-prometheus/kube-prometheus-kops-coredns.libsonnet

@@ -6,13 +6,13 @@
       metadata: {
         name: 'kube-dns-prometheus-discovery',
         namespace: 'kube-system',
-        labels: { 'k8s-app': 'kube-dns' },
+        labels: { 'app.kubernetes.io/name': 'kube-dns' },
       },
       spec: {
         ports: [
           { name: 'metrics', port: 9153, targetPort: 9153 },
         ],
-        selector: { 'k8s-app': 'kube-dns' },
+        selector: { 'app.kubernetes.io/name': 'kube-dns' },
         clusterIP: 'None',
       },
     },

jsonnet/kube-prometheus/kube-prometheus-kops.libsonnet

@@ -18,22 +18,22 @@ local service(name, namespace, labels, selector, ports) = {
     kubeControllerManagerPrometheusDiscoveryService: service(
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
-      { 'k8s-app': 'kube-controller-manager' },
+      { 'app.kubernetes.io/name': 'kube-controller-manager' },
-      { 'k8s-app': 'kube-controller-manager' },
+      { 'app.kubernetes.io/name': 'kube-controller-manager' },
       [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
     ),
     kubeSchedulerPrometheusDiscoveryService: service(
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
-      { 'k8s-app': 'kube-scheduler' },
+      { 'app.kubernetes.io/name': 'kube-scheduler' },
-      { 'k8s-app': 'kube-scheduler' },
+      { 'app.kubernetes.io/name': 'kube-scheduler' },
       [{ name: 'https-metrics', port: 10259, targetPort: 10259 }]
     ),
     kubeDnsPrometheusDiscoveryService: service(
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
-      { 'k8s-app': 'kube-dns' },
+      { 'app.kubernetes.io/name': 'kube-dns' },
-      { 'k8s-app': 'kube-dns' },
+      { 'app.kubernetes.io/name': 'kube-dns' },
       [{ name: 'metrics', port: 10055, targetPort: 10055 }, { name: 'http-metrics-dnsmasq', port: 10054, targetPort: 10054 }]
     ),
   },

jsonnet/kube-prometheus/kube-prometheus-kube-aws.libsonnet

@@ -18,15 +18,15 @@ local service(name, namespace, labels, selector, ports) = {
     kubeControllerManagerPrometheusDiscoveryService: service(
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
-      { 'k8s-app': 'kube-controller-manager' },
+      { 'app.kubernetes.io/name': 'kube-controller-manager' },
-      { 'k8s-app': 'kube-controller-manager' },
+      { 'app.kubernetes.io/name': 'kube-controller-manager' },
       [{ name: 'https-metrics', port: 10257, targetPort: 10257 }],
     ),
     kubeSchedulerPrometheusDiscoveryService: service(
       'kube-scheduler-prometheus-discovery',
       'kube-system',
-      { 'k8s-app': 'kube-scheduler' },
+      { 'app.kubernetes.io/name': 'kube-scheduler' },
-      { 'k8s-app': 'kube-scheduler' },
+      { 'app.kubernetes.io/name': 'kube-scheduler' },
       [{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
     ),
   },

jsonnet/kube-prometheus/kube-prometheus-kubeadm.libsonnet

@@ -18,14 +18,14 @@ local service(name, namespace, labels, selector, ports) = {
     kubeControllerManagerPrometheusDiscoveryService: service(
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
-      { 'k8s-app': 'kube-controller-manager' },
+      { 'app.kubernetes.io/name': 'kube-controller-manager' },
       { component: 'kube-controller-manager' },
       [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
     ),
     kubeSchedulerPrometheusDiscoveryService: service(
       'kube-scheduler-prometheus-discovery',
       'kube-system',
-      { 'k8s-app': 'kube-scheduler' },
+      { 'app.kubernetes.io/name': 'kube-scheduler' },
       { component: 'kube-scheduler' },
       [{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
     ),

jsonnet/kube-prometheus/kube-prometheus-kubespray.libsonnet

@@ -19,16 +19,16 @@ local service(name, namespace, labels, selector, ports) = {
     kubeControllerManagerPrometheusDiscoveryService: service(
       'kube-controller-manager-prometheus-discovery',
       'kube-system',
-      { 'k8s-app': 'kube-controller-manager' },
+      { 'app.kubernetes.io/name': 'kube-controller-manager' },
-      { 'k8s-app': 'kube-controller-manager' },
+      { 'app.kubernetes.io/name': 'kube-controller-manager' },
       [{ name: 'https-metrics', port: 10257, targetPort: 10257 }]
     ),
 
     kubeSchedulerPrometheusDiscoveryService: service(
       'kube-scheduler-prometheus-discovery',
       'kube-system',
-      { 'k8s-app': 'kube-scheduler' },
+      { 'app.kubernetes.io/name': 'kube-scheduler' },
-      { 'k8s-app': 'kube-scheduler' },
+      { 'app.kubernetes.io/name': 'kube-scheduler' },
       [{ name: 'https-metrics', port: 10259, targetPort: 10259 }],
     ),
 
@@ -36,7 +36,7 @@ local service(name, namespace, labels, selector, ports) = {
       spec+: {
         selector+: {
           matchLabels: {
-            'k8s-app': 'kube-scheduler',
+            'app.kubernetes.io/name': 'kube-scheduler',
           },
         },
       },
@@ -46,7 +46,7 @@ local service(name, namespace, labels, selector, ports) = {
       spec+: {
         selector+: {
           matchLabels: {
-            'k8s-app': 'kube-controller-manager',
+            'app.kubernetes.io/name': 'kube-controller-manager',
           },
         },
       },

jsonnet/kube-prometheus/kube-prometheus-static-etcd.libsonnet

@@ -16,7 +16,7 @@
       metadata: {
         name: 'etcd',
         namespace: 'kube-system',
-        labels: { 'k8s-app': 'etcd' },
+        labels: { 'app.kubernetes.io/name': 'etcd' },
       },
       spec: {
         ports: [
@@ -31,7 +31,7 @@
       metadata: {
         name: 'etcd',
         namespace: 'kube-system',
-        labels: { 'k8s-app': 'etcd' },
+        labels: { 'app.kubernetes.io/name': 'etcd' },
       },
       subsets: [{
         addresses: [
@@ -50,11 +50,11 @@
         name: 'etcd',
         namespace: 'kube-system',
         labels: {
-          'k8s-app': 'etcd',
+          'app.kubernetes.io/name': 'etcd',
         },
       },
       spec: {
-        jobLabel: 'k8s-app',
+        jobLabel: 'app.kubernetes.io/name',
         endpoints: [
           {
             port: 'metrics',
@@ -72,7 +72,7 @@
         ],
         selector: {
           matchLabels: {
-            'k8s-app': 'etcd',
+            'app.kubernetes.io/name': 'etcd',
           },
         },
       },

jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet

@@ -56,7 +56,7 @@
           name: 'thanos-sidecar',
           namespace: p.namespace,
           labels: {
-            'k8s-app': 'prometheus',
+            'app.kubernetes.io/name': 'prometheus',
           },
         },
         spec: {

jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet

@@ -6,7 +6,7 @@
       metadata: {
         name: 'weave-net',
         namespace: 'kube-system',
-        labels: { 'k8s-app': 'weave-net' },
+        labels: { 'app.kubernetes.io/name': 'weave-net' },
       },
       spec: {
         ports: [
@@ -22,12 +22,12 @@
       metadata: {
         name: 'weave-net',
         labels: {
-          'k8s-app': 'weave-net',
+          'app.kubernetes.io/name': 'weave-net',
         },
         namespace: 'monitoring',
       },
       spec: {
-        jobLabel: 'k8s-app',
+        jobLabel: 'app.kubernetes.io/name',
         endpoints: [
           {
             port: 'weave-net-metrics',
@@ -42,7 +42,7 @@
         },
         selector: {
           matchLabels: {
-            'k8s-app': 'weave-net',
+            'app.kubernetes.io/name': 'weave-net',
           },
         },
       },

jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet

@@ -12,6 +12,17 @@ local ksm = import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-
     kubeStateMetrics+:: {
       scrapeInterval: '30s',
       scrapeTimeout: '30s',
+      labels: {
+        'app.kubernetes.io/name': 'kube-state-metrics',
+        'app.kubernetes.io/version': $._config.versions.kubeStateMetrics,
+        'app.kubernetes.io/component': 'exporter',
+        'app.kubernetes.io/part-of': 'kube-prometheus',
+      },
+      selectorLabels: {
+        [labelName]: $._config.kubeStateMetrics.labels[labelName]
+        for labelName in std.objectFields($._config.kubeStateMetrics.labels)
+        if !std.setMember(labelName, ['app.kubernetes.io/version'])
+      },
     },
   },
   kubeStateMetrics+::
@@ -21,6 +32,8 @@ local ksm = import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-
       namespace:: $._config.namespace,
       version:: $._config.versions.kubeStateMetrics,
       image:: $._config.imageRepos.kubeStateMetrics + ':v' + $._config.versions.kubeStateMetrics,
+      commonLabels:: $._config.kubeStateMetrics.labels,
+      podLabels:: $._config.kubeStateMetrics.selectorLabels,
       service+: {
         spec+: {
           ports: [
@@ -58,18 +71,11 @@ local ksm = import 'github.com/kubernetes/kube-state-metrics/jsonnet/kube-state-
           metadata: {
             name: 'kube-state-metrics',
             namespace: $._config.namespace,
-            labels: {
+            labels: $._config.kubeStateMetrics.labels,
-              'app.kubernetes.io/name': 'kube-state-metrics',
-              'app.kubernetes.io/version': version,
-            },
           },
           spec: {
             jobLabel: 'app.kubernetes.io/name',
-            selector: {
+            selector: { matchLabels: $._config.kubeStateMetrics.selectorLabels },
-              matchLabels: {
-                'app.kubernetes.io/name': 'kube-state-metrics',
-              },
-            },
             endpoints: [
               {
                 port: 'https-main',

jsonnet/kube-prometheus/node-exporter/node-exporter.libsonnet

@@ -10,6 +10,8 @@
       labels: {
         'app.kubernetes.io/name': 'node-exporter',
         'app.kubernetes.io/version': $._config.versions.nodeExporter,
+        'app.kubernetes.io/component': 'exporter',
+        'app.kubernetes.io/part-of': 'kube-prometheus',
       },
       selectorLabels: {
         [labelName]: $._config.nodeExporter.labels[labelName]

jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet

@@ -8,7 +8,17 @@
     prometheusAdapter+:: {
       name: 'prometheus-adapter',
       namespace: $._config.namespace,
-      labels: { name: $._config.prometheusAdapter.name },
+      labels: {
+        'app.kubernetes.io/name': $._config.prometheusAdapter.name,
+        'app.kubernetes.io/version': $._config.versions.prometheusAdapter,
+        'app.kubernetes.io/component': 'metrics-adapter',
+        'app.kubernetes.io/part-of': 'kube-prometheus',
+      },
+      selectorLabels: {
+        [labelName]: $._config.prometheusAdapter.labels[labelName]
+        for labelName in std.objectFields($._config.prometheusAdapter.labels)
+        if !std.setMember(labelName, ['app.kubernetes.io/version'])
+      },
       prometheusURL: 'http://prometheus-' + $._config.prometheus.name + '.' + $._config.namespace + '.svc.cluster.local:9090/',
       config: {
         resourceRules: {
@@ -82,7 +92,7 @@
       },
       spec: {
         selector: {
-          matchLabels: $._config.prometheusAdapter.labels,
+          matchLabels: $._config.prometheusAdapter.selectorLabels,
         },
         endpoints: [
           {
@@ -110,7 +120,7 @@
         ports: [
           { name: 'https', targetPort: 6443, port: 443 },
         ],
-        selector: $._config.prometheusAdapter.labels,
+        selector: $._config.prometheusAdapter.selectorLabels,
       },
     },
 
@@ -143,7 +153,7 @@
         },
         spec: {
           replicas: 1,
-          selector: { matchLabels: $._config.prometheusAdapter.labels },
+          selector: { matchLabels: $._config.prometheusAdapter.selectorLabels },
           strategy: {
             rollingUpdate: {
               maxSurge: 1,

jsonnet/kube-prometheus/prometheus/prometheus.libsonnet

@@ -13,6 +13,17 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       replicas: 2,
       rules: {},
       namespaces: ['default', 'kube-system', $._config.namespace],
+      labels: {
+        'app.kubernetes.io/name': 'prometheus-' + $._config.prometheus.name,
+        'app.kubernetes.io/version': $._config.versions.prometheus,
+        'app.kubernetes.io/component': 'prometheus',
+        'app.kubernetes.io/part-of': 'kube-prometheus',
+      },
+      selectorLabels: {
+        [labelName]: $._config.prometheus.labels[labelName]
+        for labelName in std.objectFields($._config.prometheus.labels)
+        if !std.setMember(labelName, ['app.kubernetes.io/version'])
+      },
     },
   },
 
@@ -41,13 +52,13 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       metadata: {
         name: 'prometheus-' + p.name,
         namespace: p.namespace,
-        labels: { prometheus: p.name },
+        labels: { prometheus: p.name } + $._config.prometheus.labels,
       },
       spec: {
         ports: [
           { name: 'web', targetPort: 'web', port: 9090 },
         ],
-        selector: { app: 'prometheus', prometheus: p.name },
+        selector: { app: 'prometheus', prometheus: p.name } + $._config.prometheus.selectorLabels,
         sessionAffinity: 'ClientIP',
       },
     },
@@ -192,12 +203,15 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       metadata: {
         name: p.name,
         namespace: p.namespace,
-        labels: { prometheus: p.name },
+        labels: { prometheus: p.name } + $._config.prometheus.labels,
       },
       spec: {
         replicas: p.replicas,
         version: $._config.versions.prometheus,
         image: $._config.imageRepos.prometheus + ':' + $._config.versions.prometheus,
+        podMetadata: {
+          labels: $._config.prometheus.labels
+        },
         serviceAccountName: 'prometheus-' + p.name,
         serviceMonitorSelector: {},
         podMonitorSelector: {},
@@ -236,11 +250,11 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       metadata: {
         name: 'prometheus',
         namespace: p.namespace,
-        labels: { 'k8s-app': 'prometheus' },
+        labels: $._config.prometheus.labels,
       },
       spec: {
         selector: {
-          matchLabels: { prometheus: p.name },
+          matchLabels: { prometheus: p.name } + $._config.prometheus.selectorLabels,
         },
         endpoints: [{
           port: 'web',
@@ -255,10 +269,10 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       metadata: {
         name: 'kube-scheduler',
         namespace: p.namespace,
-        labels: { 'k8s-app': 'kube-scheduler' },
+        labels: { 'app.kubernetes.io/name': 'kube-scheduler' },
       },
       spec: {
-        jobLabel: 'k8s-app',
+        jobLabel: 'app.kubernetes.io/name',
         endpoints: [{
           port: 'https-metrics',
           interval: '30s',
@@ -267,7 +281,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
           tlsConfig: { insecureSkipVerify: true },
         }],
         selector: {
-          matchLabels: { 'k8s-app': 'kube-scheduler' },
+          matchLabels: { 'app.kubernetes.io/name': 'kube-scheduler' },
         },
         namespaceSelector: {
           matchNames: ['kube-system'],
@@ -281,10 +295,10 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       metadata: {
         name: 'kubelet',
         namespace: p.namespace,
-        labels: { 'k8s-app': 'kubelet' },
+        labels: { 'app.kubernetes.io/name': 'kubelet' },
       },
       spec: {
-        jobLabel: 'k8s-app',
+        jobLabel: 'app.kubernetes.io/name',
         endpoints: [
           {
             port: 'https-metrics',
@@ -339,7 +353,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
           },
         ],
         selector: {
-          matchLabels: { 'k8s-app': 'kubelet' },
+          matchLabels: { 'app.kubernetes.io/name': 'kubelet' },
         },
         namespaceSelector: {
           matchNames: ['kube-system'],
@@ -353,10 +367,10 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       metadata: {
         name: 'kube-controller-manager',
         namespace: p.namespace,
-        labels: { 'k8s-app': 'kube-controller-manager' },
+        labels: { 'app.kubernetes.io/name': 'kube-controller-manager' },
       },
       spec: {
-        jobLabel: 'k8s-app',
+        jobLabel: 'app.kubernetes.io/name',
         endpoints: [{
           port: 'https-metrics',
           interval: '30s',
@@ -374,7 +388,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
           ],
         }],
         selector: {
-          matchLabels: { 'k8s-app': 'kube-controller-manager' },
+          matchLabels: { 'app.kubernetes.io/name': 'kube-controller-manager' },
         },
         namespaceSelector: {
           matchNames: ['kube-system'],
@@ -388,7 +402,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       metadata: {
         name: 'kube-apiserver',
         namespace: p.namespace,
-        labels: { 'k8s-app': 'apiserver' },
+        labels: { 'app.kubernetes.io/name': 'apiserver' },
       },
       spec: {
         jobLabel: 'component',
@@ -442,12 +456,12 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
       metadata: {
         name: 'coredns',
         namespace: p.namespace,
-        labels: { 'k8s-app': 'coredns' },
+        labels: { 'app.kubernetes.io/name': 'coredns' },
       },
       spec: {
-        jobLabel: 'k8s-app',
+        jobLabel: 'app.kubernetes.io/name',
         selector: {
-          matchLabels: { 'k8s-app': 'kube-dns' },
+          matchLabels: { 'app.kubernetes.io/name': 'kube-dns' },
         },
         namespaceSelector: {
           matchNames: ['kube-system'],

manifests/alertmanager-alertmanager.yaml

@@ -3,12 +3,22 @@ kind: Alertmanager
 metadata:
   labels:
     alertmanager: main
+    app.kubernetes.io/component: router
+    app.kubernetes.io/name: alertmanager-main
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: v0.21.0
   name: main
   namespace: monitoring
 spec:
   image: quay.io/prometheus/alertmanager:v0.21.0
   nodeSelector:
     kubernetes.io/os: linux
+  podMetadata:
+    labels:
+      app.kubernetes.io/component: router
+      app.kubernetes.io/name: alertmanager-main
+      app.kubernetes.io/part-of: kube-prometheus
+      app.kubernetes.io/version: v0.21.0
   replicas: 3
   securityContext:
     fsGroup: 2000

manifests/alertmanager-service.yaml

@@ -3,6 +3,10 @@ kind: Service
 metadata:
   labels:
     alertmanager: main
+    app.kubernetes.io/component: router
+    app.kubernetes.io/name: alertmanager-main
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: v0.21.0
   name: alertmanager-main
   namespace: monitoring
 spec:
@@ -13,4 +17,7 @@ spec:
   selector:
     alertmanager: main
     app: alertmanager
+    app.kubernetes.io/component: router
+    app.kubernetes.io/name: alertmanager-main
+    app.kubernetes.io/part-of: kube-prometheus
   sessionAffinity: ClientIP

manifests/alertmanager-serviceMonitor.yaml

@@ -2,7 +2,10 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    k8s-app: alertmanager
+    app.kubernetes.io/component: router
+    app.kubernetes.io/name: alertmanager-main
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: v0.21.0
   name: alertmanager
   namespace: monitoring
 spec:
@@ -12,3 +15,6 @@ spec:
   selector:
     matchLabels:
       alertmanager: main
+      app.kubernetes.io/component: router
+      app.kubernetes.io/name: alertmanager-main
+      app.kubernetes.io/part-of: kube-prometheus

manifests/kube-state-metrics-clusterRole.yaml

@@ -2,8 +2,10 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:
+    app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: v1.9.7
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: 1.9.7
   name: kube-state-metrics
 rules:
 - apiGroups:

manifests/kube-state-metrics-clusterRoleBinding.yaml

@@ -2,8 +2,10 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   labels:
+    app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: v1.9.7
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: 1.9.7
   name: kube-state-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io

manifests/kube-state-metrics-deployment.yaml

@@ -2,20 +2,26 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
+    app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: v1.9.7
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: 1.9.7
   name: kube-state-metrics
   namespace: monitoring
 spec:
   replicas: 1
   selector:
     matchLabels:
+      app.kubernetes.io/component: exporter
       app.kubernetes.io/name: kube-state-metrics
+      app.kubernetes.io/part-of: kube-prometheus
   template:
     metadata:
       labels:
+        app.kubernetes.io/component: exporter
         app.kubernetes.io/name: kube-state-metrics
-        app.kubernetes.io/version: v1.9.7
+        app.kubernetes.io/part-of: kube-prometheus
+        app.kubernetes.io/version: 1.9.7
     spec:
       containers:
       - args:

manifests/kube-state-metrics-service.yaml

@@ -2,8 +2,10 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
+    app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: v1.9.7
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: 1.9.7
   name: kube-state-metrics
   namespace: monitoring
 spec:
@@ -16,4 +18,6 @@ spec:
     port: 9443
     targetPort: https-self
   selector:
+    app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
+    app.kubernetes.io/part-of: kube-prometheus

manifests/kube-state-metrics-serviceAccount.yaml

@@ -2,7 +2,9 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
+    app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: v1.9.7
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: 1.9.7
   name: kube-state-metrics
   namespace: monitoring

manifests/kube-state-metrics-serviceMonitor.yaml

@@ -2,7 +2,9 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
+    app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
+    app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: 1.9.7
   name: kube-state-metrics
   namespace: monitoring
@@ -28,4 +30,6 @@ spec:
   jobLabel: app.kubernetes.io/name
   selector:
     matchLabels:
+      app.kubernetes.io/component: exporter
       app.kubernetes.io/name: kube-state-metrics
+      app.kubernetes.io/part-of: kube-prometheus

manifests/node-exporter-daemonset.yaml

@@ -2,18 +2,24 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   labels:
+    app.kubernetes.io/component: exporter
     app.kubernetes.io/name: node-exporter
+    app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: v1.0.1
   name: node-exporter
   namespace: monitoring
 spec:
   selector:
     matchLabels:
+      app.kubernetes.io/component: exporter
       app.kubernetes.io/name: node-exporter
+      app.kubernetes.io/part-of: kube-prometheus
   template:
     metadata:
       labels:
+        app.kubernetes.io/component: exporter
         app.kubernetes.io/name: node-exporter
+        app.kubernetes.io/part-of: kube-prometheus
         app.kubernetes.io/version: v1.0.1
     spec:
       containers:

manifests/node-exporter-service.yaml

@@ -2,7 +2,9 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
+    app.kubernetes.io/component: exporter
     app.kubernetes.io/name: node-exporter
+    app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: v1.0.1
   name: node-exporter
   namespace: monitoring
@@ -13,4 +15,6 @@ spec:
     port: 9100
     targetPort: https
   selector:
+    app.kubernetes.io/component: exporter
     app.kubernetes.io/name: node-exporter
+    app.kubernetes.io/part-of: kube-prometheus

manifests/node-exporter-serviceMonitor.yaml

@@ -2,7 +2,9 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
+    app.kubernetes.io/component: exporter
     app.kubernetes.io/name: node-exporter
+    app.kubernetes.io/part-of: kube-prometheus
     app.kubernetes.io/version: v1.0.1
   name: node-exporter
   namespace: monitoring
@@ -24,4 +26,6 @@ spec:
   jobLabel: app.kubernetes.io/name
   selector:
     matchLabels:
+      app.kubernetes.io/component: exporter
       app.kubernetes.io/name: node-exporter
+      app.kubernetes.io/part-of: kube-prometheus

manifests/prometheus-adapter-deployment.yaml

@@ -7,7 +7,9 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      name: prometheus-adapter
+      app.kubernetes.io/component: metrics-adapter
+      app.kubernetes.io/name: prometheus-adapter
+      app.kubernetes.io/part-of: kube-prometheus
   strategy:
     rollingUpdate:
       maxSurge: 1
@@ -15,7 +17,10 @@ spec:
   template:
     metadata:
       labels:
-        name: prometheus-adapter
+        app.kubernetes.io/component: metrics-adapter
+        app.kubernetes.io/name: prometheus-adapter
+        app.kubernetes.io/part-of: kube-prometheus
+        app.kubernetes.io/version: v0.8.2
     spec:
       containers:
       - args:

manifests/prometheus-adapter-service.yaml

@@ -2,7 +2,10 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
-    name: prometheus-adapter
+    app.kubernetes.io/component: metrics-adapter
+    app.kubernetes.io/name: prometheus-adapter
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: v0.8.2
   name: prometheus-adapter
   namespace: monitoring
 spec:
@@ -11,4 +14,6 @@ spec:
     port: 443
     targetPort: 6443
   selector:
-    name: prometheus-adapter
+    app.kubernetes.io/component: metrics-adapter
+    app.kubernetes.io/name: prometheus-adapter
+    app.kubernetes.io/part-of: kube-prometheus

manifests/prometheus-adapter-serviceMonitor.yaml

@@ -2,7 +2,10 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    name: prometheus-adapter
+    app.kubernetes.io/component: metrics-adapter
+    app.kubernetes.io/name: prometheus-adapter
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: v0.8.2
   name: prometheus-adapter
   namespace: monitoring
 spec:
@@ -15,4 +18,6 @@ spec:
       insecureSkipVerify: true
   selector:
     matchLabels:
-      name: prometheus-adapter
+      app.kubernetes.io/component: metrics-adapter
+      app.kubernetes.io/name: prometheus-adapter
+      app.kubernetes.io/part-of: kube-prometheus

manifests/prometheus-prometheus.yaml

@@ -2,6 +2,10 @@ apiVersion: monitoring.coreos.com/v1
 kind: Prometheus
 metadata:
   labels:
+    app.kubernetes.io/component: prometheus
+    app.kubernetes.io/name: prometheus-k8s
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: v2.22.1
     prometheus: k8s
   name: k8s
   namespace: monitoring
@@ -14,6 +18,12 @@ spec:
   image: quay.io/prometheus/prometheus:v2.22.1
   nodeSelector:
     kubernetes.io/os: linux
+  podMetadata:
+    labels:
+      app.kubernetes.io/component: prometheus
+      app.kubernetes.io/name: prometheus-k8s
+      app.kubernetes.io/part-of: kube-prometheus
+      app.kubernetes.io/version: v2.22.1
   podMonitorNamespaceSelector: {}
   podMonitorSelector: {}
   probeNamespaceSelector: {}

manifests/prometheus-service.yaml

@@ -2,6 +2,10 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
+    app.kubernetes.io/component: prometheus
+    app.kubernetes.io/name: prometheus-k8s
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: v2.22.1
     prometheus: k8s
   name: prometheus-k8s
   namespace: monitoring
@@ -12,5 +16,8 @@ spec:
     targetPort: web
   selector:
     app: prometheus
+    app.kubernetes.io/component: prometheus
+    app.kubernetes.io/name: prometheus-k8s
+    app.kubernetes.io/part-of: kube-prometheus
     prometheus: k8s
   sessionAffinity: ClientIP

manifests/prometheus-serviceMonitor.yaml

@@ -2,7 +2,10 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    k8s-app: prometheus
+    app.kubernetes.io/component: prometheus
+    app.kubernetes.io/name: prometheus-k8s
+    app.kubernetes.io/part-of: kube-prometheus
+    app.kubernetes.io/version: v2.22.1
   name: prometheus
   namespace: monitoring
 spec:
@@ -11,4 +14,7 @@ spec:
     port: web
   selector:
     matchLabels:
+      app.kubernetes.io/component: prometheus
+      app.kubernetes.io/name: prometheus-k8s
+      app.kubernetes.io/part-of: kube-prometheus
       prometheus: k8s

manifests/prometheus-serviceMonitorApiserver.yaml

@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    k8s-app: apiserver
+    app.kubernetes.io/name: apiserver
   name: kube-apiserver
   namespace: monitoring
 spec:

manifests/prometheus-serviceMonitorCoreDNS.yaml

@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    k8s-app: coredns
+    app.kubernetes.io/name: coredns
   name: coredns
   namespace: monitoring
 spec:
@@ -10,10 +10,10 @@ spec:
   - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
     interval: 15s
     port: metrics
-  jobLabel: k8s-app
+  jobLabel: app.kubernetes.io/name
   namespaceSelector:
     matchNames:
     - kube-system
   selector:
     matchLabels:
-      k8s-app: kube-dns
+      app.kubernetes.io/name: kube-dns

manifests/prometheus-serviceMonitorKubeControllerManager.yaml

@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    k8s-app: kube-controller-manager
+    app.kubernetes.io/name: kube-controller-manager
   name: kube-controller-manager
   namespace: monitoring
 spec:
@@ -50,10 +50,10 @@ spec:
     scheme: https
     tlsConfig:
       insecureSkipVerify: true
-  jobLabel: k8s-app
+  jobLabel: app.kubernetes.io/name
   namespaceSelector:
     matchNames:
     - kube-system
   selector:
     matchLabels:
-      k8s-app: kube-controller-manager
+      app.kubernetes.io/name: kube-controller-manager

manifests/prometheus-serviceMonitorKubeScheduler.yaml

@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    k8s-app: kube-scheduler
+    app.kubernetes.io/name: kube-scheduler
   name: kube-scheduler
   namespace: monitoring
 spec:
@@ -13,10 +13,10 @@ spec:
     scheme: https
     tlsConfig:
       insecureSkipVerify: true
-  jobLabel: k8s-app
+  jobLabel: app.kubernetes.io/name
   namespaceSelector:
     matchNames:
     - kube-system
   selector:
     matchLabels:
-      k8s-app: kube-scheduler
+      app.kubernetes.io/name: kube-scheduler

manifests/prometheus-serviceMonitorKubelet.yaml

@@ -2,7 +2,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    k8s-app: kubelet
+    app.kubernetes.io/name: kubelet
   name: kubelet
   namespace: monitoring
 spec:
@@ -81,10 +81,10 @@ spec:
     scheme: https
     tlsConfig:
       insecureSkipVerify: true
-  jobLabel: k8s-app
+  jobLabel: app.kubernetes.io/name
   namespaceSelector:
     matchNames:
     - kube-system
   selector:
     matchLabels:
-      k8s-app: kubelet
+      app.kubernetes.io/name: kubelet