diff --git a/jsonnet/kube-prometheus/components/prometheus.libsonnet b/jsonnet/kube-prometheus/components/prometheus.libsonnet index cf048c09362b851261785e92a026d778209d294e..9454a272635eec8547720c76421a54d2f3531358 100644 --- a/jsonnet/kube-prometheus/components/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/components/prometheus.libsonnet @@ -332,7 +332,7 @@ function(params) { labels: { 'app.kubernetes.io/name': 'kubelet' }, }, spec: { - jobLabel: 'k8s-app', + jobLabel: 'app.kubernetes.io/name', endpoints: [ { port: 'https-metrics', @@ -387,7 +387,7 @@ function(params) { }, ], selector: { - matchLabels: { 'k8s-app': 'kubelet' }, + matchLabels: { 'app.kubernetes.io/name': 'kubelet' }, }, namespaceSelector: { matchNames: ['kube-system'], diff --git a/manifests/prometheus-serviceMonitorKubelet.yaml b/manifests/prometheus-serviceMonitorKubelet.yaml index 72dff3fb909493f5a36edcb21cdba3a04c637871..dc329395fb2266db5e4ca2221b55dc879b7cbabf 100644 --- a/manifests/prometheus-serviceMonitorKubelet.yaml +++ b/manifests/prometheus-serviceMonitorKubelet.yaml @@ -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