From ec56f4559fb8ec27d118ba0a71a7a94479a9f7b9 Mon Sep 17 00:00:00 2001
From: Fran <51233345+francescsanjuanmrf@users.noreply.github.com>
Date: Mon, 20 Mar 2023 10:21:46 +0100
Subject: [PATCH] Improve ArgoCD support (#2041)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Improve ArgoCD support
Signed-off-by: Fran Sanjuán <francesc.sanjuan@marfeel.com>
* Add modified yamls
Signed-off-by: Fran Sanjuán <francesc.sanjuan@marfeel.com>
---------
Signed-off-by: Fran Sanjuán <francesc.sanjuan@marfeel.com>
---
.../components/k8s-control-plane.libsonnet | 3 +++
.../kubernetesControlPlane-serviceMonitorKubelet.yaml | 9 ++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet b/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
index de4c5c93..95ceb490 100644
--- a/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
+++ b/jsonnet/kube-prometheus/components/k8s-control-plane.libsonnet
@@ -105,6 +105,7 @@ function(params) {
bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
metricRelabelings: relabelings,
relabelings: [{
+ action: 'replace',
sourceLabels: ['__metrics_path__'],
targetLabel: 'metrics_path',
}],
@@ -121,6 +122,7 @@ function(params) {
},
bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
relabelings: [{
+ action: 'replace',
sourceLabels: ['__metrics_path__'],
targetLabel: 'metrics_path',
}],
@@ -166,6 +168,7 @@ function(params) {
tlsConfig: { insecureSkipVerify: true },
bearerTokenFile: '/var/run/secrets/kubernetes.io/serviceaccount/token',
relabelings: [{
+ action: 'replace',
sourceLabels: ['__metrics_path__'],
targetLabel: 'metrics_path',
}],
diff --git a/manifests/kubernetesControlPlane-serviceMonitorKubelet.yaml b/manifests/kubernetesControlPlane-serviceMonitorKubelet.yaml
index 92b3d13d..d0d2611f 100644
--- a/manifests/kubernetesControlPlane-serviceMonitorKubelet.yaml
+++ b/manifests/kubernetesControlPlane-serviceMonitorKubelet.yaml
@@ -46,7 +46,8 @@ spec:
- __name__
port: https-metrics
relabelings:
- - sourceLabels:
+ - action: replace
+ sourceLabels:
- __metrics_path__
targetLabel: metrics_path
scheme: https
@@ -75,7 +76,8 @@ spec:
path: /metrics/cadvisor
port: https-metrics
relabelings:
- - sourceLabels:
+ - action: replace
+ sourceLabels:
- __metrics_path__
targetLabel: metrics_path
scheme: https
@@ -87,7 +89,8 @@ spec:
path: /metrics/probes
port: https-metrics
relabelings:
- - sourceLabels:
+ - action: replace
+ sourceLabels:
- __metrics_path__
targetLabel: metrics_path
scheme: https
--
GitLab