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

Merge pull request #1553 from PhilipGough/bump-k8s

Browse Source
This commit is contained in:
Paweł Krupa
2021-12-16 19:22:18 +01:00
committed by GitHub
parent ddfbed0d89 16bc5d63b3
commit 3652ff073e
8 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yaml
+2 -2
View File
@@ -63,8 +63,8 @@ jobs:
strategy: strategy:
matrix: matrix:
kind-image: kind-image:
- 'kindest/node:v1.21.1' - 'kindest/node:v1.23.0'
- 'kindest/node:v1.22.0' - 'kindest/node:v1.22.4'
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
README.md
+7 -7
View File
@@ -91,13 +91,13 @@ $ minikube addons disable metrics-server
The following versions are supported and work as we test against these versions in their respective branches. But note that other versions might work! The following versions are supported and work as we test against these versions in their respective branches. But note that other versions might work!
| kube-prometheus stack | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 | Kubernetes 1.22 | | kube-prometheus stack | Kubernetes 1.18 | Kubernetes 1.19 | Kubernetes 1.20 | Kubernetes 1.21 | Kubernetes 1.22 | Kubernetes 1.23 |
|------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------| |------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|
| [`release-0.6`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.6) | ✗ | ✔ | ✗ | ✗ | ✗ | | [`release-0.6`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.6) | ✗ | ✔ | ✗ | ✗ | ✗ | ✗ |
| [`release-0.7`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.7) | ✗ | ✔ | ✔ | ✗ | ✗ | | [`release-0.7`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.7) | ✗ | ✔ | ✔ | ✗ | ✗ | ✗ |
| [`release-0.8`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.8) | ✗ | ✗ | ✔ | ✔ | ✗ | | [`release-0.8`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.8) | ✗ | ✗ | ✔ | ✔ | ✗ | ✗ |
| [`release-0.9`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.9) | ✗ | ✗ | ✗ | ✔ | ✔ | | [`release-0.9`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.9) | ✗ | ✗ | ✗ | ✔ | ✔ | ✗ |
| [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main) | ✗ | ✗ | ✗ | ✔ | ✔ | | [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main) | ✗ | ✗ | ✗ | ✗ | ✔ | ✔ |
## Quickstart ## Quickstart
jsonnet/kube-prometheus/addons/dropping-deprecated-metrics-relabelings.libsonnet
+1 -1
View File
@@ -14,7 +14,7 @@
// Drop all apiserver metrics which are deprecated in kubernetes. // Drop all apiserver metrics which are deprecated in kubernetes.
{ {
sourceLabels: ['__name__'], sourceLabels: ['__name__'],
regex: 'apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs)', regex: 'apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs|longrunning_gauge|registered_watchers)',
action: 'drop', action: 'drop',
}, },
// Drop all docker metrics which are deprecated in kubernetes. // Drop all docker metrics which are deprecated in kubernetes.
jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
+16 -5
View File
@@ -310,11 +310,22 @@ function(params) {
namespaceSelector: { namespaceSelector: {
matchNames: ['kube-system'], matchNames: ['kube-system'],
}, },
endpoints: [{ endpoints: [
port: 'metrics', {
interval: '15s', port: 'metrics',
bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token', interval: '15s',
}], bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
metricRelabelings: [
// Drop deprecated metrics
// TODO (pgough) - consolidate how we drop metrics across the project
{
sourceLabels: ['__name__'],
regex: 'coredns_cache_misses_total',
action: 'drop',
},
],
},
],
}, },
}, },
manifests/kubernetesControlPlane-serviceMonitorApiserver.yaml
+1 -1
View File
@@ -20,7 +20,7 @@ spec:
sourceLabels: sourceLabels:
- __name__ - __name__
- action: drop - action: drop
regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs) regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs|longrunning_gauge|registered_watchers)
sourceLabels: sourceLabels:
- __name__ - __name__
- action: drop - action: drop
manifests/kubernetesControlPlane-serviceMonitorCoreDNS.yaml
+5
View File
@@ -10,6 +10,11 @@ spec:
endpoints: endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 15s interval: 15s
metricRelabelings:
- action: drop
regex: coredns_cache_misses_total
sourceLabels:
- __name__
port: metrics port: metrics
jobLabel: app.kubernetes.io/name jobLabel: app.kubernetes.io/name
namespaceSelector: namespaceSelector:
manifests/kubernetesControlPlane-serviceMonitorKubeControllerManager.yaml
+1 -1
View File
@@ -20,7 +20,7 @@ spec:
sourceLabels: sourceLabels:
- __name__ - __name__
- action: drop - action: drop
regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs) regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs|longrunning_gauge|registered_watchers)
sourceLabels: sourceLabels:
- __name__ - __name__
- action: drop - action: drop
manifests/kubernetesControlPlane-serviceMonitorKubelet.yaml
+1 -1
View File
@@ -21,7 +21,7 @@ spec:
sourceLabels: sourceLabels:
- __name__ - __name__
- action: drop - action: drop
regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs) regex: apiserver_(request_count|request_latencies|request_latencies_summary|dropped_requests|storage_data_key_generation_latencies_microseconds|storage_transformation_failures_total|storage_transformation_latencies_microseconds|proxy_tunnel_sync_latency_secs|longrunning_gauge|registered_watchers)
sourceLabels: sourceLabels:
- __name__ - __name__
- action: drop - action: drop