From f4e3a1384b627773f85a67f60cb561802fb19bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Tue, 23 Jan 2024 18:00:13 +0100 Subject: [PATCH] fix --- monitor/node-exporter/datas.tf | 13 +++++++++++++ ...ometheus-community-kube-node-exporter.rules.yaml | 4 ++-- ...ule_prometheus-community-kube-node-exporter.yaml | 4 ++-- ...Rule_prometheus-community-kube-node-network.yaml | 4 ++-- ...usRule_prometheus-community-kube-node.rules.yaml | 4 ++-- ...etheus-community-kube-node-cluster-rsrc-use.yaml | 4 ++-- ...Map_prometheus-community-kube-node-rsrc-use.yaml | 4 ++-- ...gMap_prometheus-community-kube-nodes-darwin.yaml | 4 ++-- ...1_ConfigMap_prometheus-community-kube-nodes.yaml | 4 ++-- 9 files changed, 29 insertions(+), 16 deletions(-) diff --git a/monitor/node-exporter/datas.tf b/monitor/node-exporter/datas.tf index 422f06f..4f4eb31 100644 --- a/monitor/node-exporter/datas.tf +++ b/monitor/node-exporter/datas.tf @@ -18,4 +18,17 @@ data "kustomization_overlay" "data" { new_name = "${var.images.node-exporter.registry}/${var.images.node-exporter.repository}" new_tag = "${var.images.node-exporter.tag}" } + patches { + target { + kind = "ServiceMonitor" + name = "prometheus-community-prometheus-node-exporter" + } + patch = <<-EOF + - op: replace + path: /spec/selector/matchLabels/app.kubernetes.io~1instance + value: "${var.instance}" + EOF + } } + + diff --git a/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node-exporter.rules.yaml b/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node-exporter.rules.yaml index c2ab2d0..9c87a98 100644 --- a/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node-exporter.rules.yaml +++ b/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node-exporter.rules.yaml @@ -9,9 +9,9 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: prometheus-community - app.kubernetes.io/version: "56.0.2" + app.kubernetes.io/version: "56.0.3" app.kubernetes.io/part-of: kube-prometheus-stack - chart: kube-prometheus-stack-56.0.2 + chart: kube-prometheus-stack-56.0.3 release: "prometheus-community" heritage: "Helm" spec: diff --git a/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node-exporter.yaml b/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node-exporter.yaml index fcb6a7b..58b495f 100644 --- a/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node-exporter.yaml +++ b/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node-exporter.yaml @@ -9,9 +9,9 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: prometheus-community - app.kubernetes.io/version: "56.0.2" + app.kubernetes.io/version: "56.0.3" app.kubernetes.io/part-of: kube-prometheus-stack - chart: kube-prometheus-stack-56.0.2 + chart: kube-prometheus-stack-56.0.3 release: "prometheus-community" heritage: "Helm" spec: diff --git a/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node-network.yaml b/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node-network.yaml index 4e71d74..cf4d5df 100644 --- a/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node-network.yaml +++ b/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node-network.yaml @@ -9,9 +9,9 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: prometheus-community - app.kubernetes.io/version: "56.0.2" + app.kubernetes.io/version: "56.0.3" app.kubernetes.io/part-of: kube-prometheus-stack - chart: kube-prometheus-stack-56.0.2 + chart: kube-prometheus-stack-56.0.3 release: "prometheus-community" heritage: "Helm" spec: diff --git a/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node.rules.yaml b/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node.rules.yaml index a10a0a2..5138e2b 100644 --- a/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node.rules.yaml +++ b/monitor/node-exporter/monitoring.coreos.com_v1_PrometheusRule_prometheus-community-kube-node.rules.yaml @@ -9,9 +9,9 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: prometheus-community - app.kubernetes.io/version: "56.0.2" + app.kubernetes.io/version: "56.0.3" app.kubernetes.io/part-of: kube-prometheus-stack - chart: kube-prometheus-stack-56.0.2 + chart: kube-prometheus-stack-56.0.3 release: "prometheus-community" heritage: "Helm" spec: diff --git a/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-node-cluster-rsrc-use.yaml b/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-node-cluster-rsrc-use.yaml index 24d2fee..988efde 100644 --- a/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-node-cluster-rsrc-use.yaml +++ b/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-node-cluster-rsrc-use.yaml @@ -12,9 +12,9 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: prometheus-community - app.kubernetes.io/version: "56.0.2" + app.kubernetes.io/version: "56.0.3" app.kubernetes.io/part-of: kube-prometheus-stack - chart: kube-prometheus-stack-56.0.2 + chart: kube-prometheus-stack-56.0.3 release: "prometheus-community" heritage: "Helm" data: diff --git a/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-node-rsrc-use.yaml b/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-node-rsrc-use.yaml index fb769cc..cfd6579 100644 --- a/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-node-rsrc-use.yaml +++ b/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-node-rsrc-use.yaml @@ -12,9 +12,9 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: prometheus-community - app.kubernetes.io/version: "56.0.2" + app.kubernetes.io/version: "56.0.3" app.kubernetes.io/part-of: kube-prometheus-stack - chart: kube-prometheus-stack-56.0.2 + chart: kube-prometheus-stack-56.0.3 release: "prometheus-community" heritage: "Helm" data: diff --git a/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-nodes-darwin.yaml b/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-nodes-darwin.yaml index 8715d53..61e0034 100644 --- a/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-nodes-darwin.yaml +++ b/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-nodes-darwin.yaml @@ -12,9 +12,9 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: prometheus-community - app.kubernetes.io/version: "56.0.2" + app.kubernetes.io/version: "56.0.3" app.kubernetes.io/part-of: kube-prometheus-stack - chart: kube-prometheus-stack-56.0.2 + chart: kube-prometheus-stack-56.0.3 release: "prometheus-community" heritage: "Helm" data: diff --git a/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-nodes.yaml b/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-nodes.yaml index 630d407..c68be78 100644 --- a/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-nodes.yaml +++ b/monitor/node-exporter/v1_ConfigMap_prometheus-community-kube-nodes.yaml @@ -12,9 +12,9 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/instance: prometheus-community - app.kubernetes.io/version: "56.0.2" + app.kubernetes.io/version: "56.0.3" app.kubernetes.io/part-of: kube-prometheus-stack - chart: kube-prometheus-stack-56.0.2 + chart: kube-prometheus-stack-56.0.3 release: "prometheus-community" heritage: "Helm" data: