easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contrib/kube-prometheus: Generate new manifests after dropping etcd labels

Browse Source
This commit is contained in:
Matthias Loibl
2018-10-01 14:51:10 +02:00
parent eca6e62402
commit 32a24f07cb
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsonnetfile.lock.json
View File

@@ -8,7 +8,7 @@
"subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus" "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
} }
}, },
"version": "50b1dbe739d9e4a59fb936b1733f8e53c86de897" "version": "004e648d186bc7be6f1f519da26f96bc2533f1b6"
}, },
{ {
"name": "ksonnet", "name": "ksonnet",
@@ -48,7 +48,7 @@
"subdir": "grafana-builder" "subdir": "grafana-builder"
} }
}, },
"version": "94aef231932810633416bfe596a41dbad2b1ebb9" "version": "bce24b0b087f7dc09c9e9f066f3e554a851792e9"
}, },
{ {
"name": "grafana", "name": "grafana",
@@ -78,7 +78,7 @@
"subdir": "Documentation/etcd-mixin" "subdir": "Documentation/etcd-mixin"
} }
}, },
"version": "a3e242d80ae1a13ae57904fc12e91fe4c9ecf972" "version": "c74998267c71ef4a0fa847ce16d620b7fe3580bf"
} }
] ]
} }

5
manifests/prometheus-serviceMonitorApiserver.yaml
View File

@@ -9,6 +9,11 @@ spec:
endpoints: endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s interval: 30s
metricRelabelings:
- action: drop
regex: etcd_(debugging|disk|request|server).*
sourceLabels:
- __name__
port: https port: https
scheme: https scheme: https
tlsConfig: tlsConfig:

5
manifests/prometheus-serviceMonitorKubeControllerManager.yaml
View File

@@ -8,6 +8,11 @@ metadata:
spec: spec:
endpoints: endpoints:
- interval: 30s - interval: 30s
metricRelabelings:
- action: drop
regex: etcd_(debugging|disk|request|server).*
sourceLabels:
- __name__
port: http-metrics port: http-metrics
jobLabel: k8s-app jobLabel: k8s-app
namespaceSelector: namespaceSelector: