mirrors/kube-prometheus
1
0
Fork 0
mirror of https://github.com/prometheus-operator/kube-prometheus.git synced 2025-11-01 08:31:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #858 from brancz/fix-kubelet-label

Browse Source 
kubelet: Revert label selector
This commit is contained in:
Frederic Branczyk 2021-01-04 16:53:56 +01:00 committed by GitHub
commit 808c2f8c3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jsonnet/kube-prometheus/prometheus/prometheus.libsonnet
View File

@ -309,7 +309,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
labels: { 'app.kubernetes.io/name': 'kubelet' }, labels: { 'app.kubernetes.io/name': 'kubelet' },
}, },
spec: { spec: {
jobLabel: 'app.kubernetes.io/name', jobLabel: 'k8s-app',
endpoints: [ endpoints: [
{ {
port: 'https-metrics', port: 'https-metrics',
@ -364,7 +364,7 @@ local relabelings = import 'kube-prometheus/dropping-deprecated-metrics-relabeli
}, },
], ],
selector: { selector: {
matchLabels: { 'app.kubernetes.io/name': 'kubelet' }, matchLabels: { 'k8s-app': 'kubelet' },
}, },
namespaceSelector: { namespaceSelector: {
matchNames: ['kube-system'], matchNames: ['kube-system'],

4
manifests/prometheus-serviceMonitorKubelet.yaml
View File

@ -81,10 +81,10 @@ spec:
scheme: https scheme: https
tlsConfig: tlsConfig:
insecureSkipVerify: true insecureSkipVerify: true
jobLabel: app.kubernetes.io/name jobLabel: k8s-app
namespaceSelector: namespaceSelector:
matchNames: matchNames:
- kube-system - kube-system
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/name: kubelet k8s-app: kubelet