From 1878b44068379de30b24fe3ea5dfd87b1646b75c Mon Sep 17 00:00:00 2001 From: friedrich goerz Date: Mon, 27 Feb 2023 11:58:41 +0100 Subject: [PATCH] NOTICKET: trying to fix wrongly shown s3metrics in minio-webui - one scrape job explicitly for each mobene-stage --- templates/servicemonitor_s3_minio.yaml | 2 +- values_cusprod.yaml | 2 +- values_cusqa.yaml | 2 +- values_nsodev.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/servicemonitor_s3_minio.yaml b/templates/servicemonitor_s3_minio.yaml index b91ec7c..c2d69a1 100644 --- a/templates/servicemonitor_s3_minio.yaml +++ b/templates/servicemonitor_s3_minio.yaml @@ -6,7 +6,7 @@ metadata: release: kube-prometheus-stack v1.min.io/tenant: {{ .Values.tenant.tenant.name }} spec: - jobLabel: minio + jobLabel: minio-{{ .Release.Name }} selector: matchLabels: v1.min.io/tenant: {{ .Values.tenant.tenant.name }} diff --git a/values_cusprod.yaml b/values_cusprod.yaml index fd90ba0..3f7ba99 100644 --- a/values_cusprod.yaml +++ b/values_cusprod.yaml @@ -39,7 +39,7 @@ tenant: - name: MINIO_PROMETHEUS_AUTH_TYPE value: "public" - name: MINIO_PROMETHEUS_JOB_ID - value: "minio" + value: "minio-cusprod" - name: MINIO_PROMETHEUS_URL value: "http://kube-prometheus-stack-prometheus.monitoring:9090" - name: CONSOLE_PROMETHEUS_URL diff --git a/values_cusqa.yaml b/values_cusqa.yaml index 6969887..b5570db 100644 --- a/values_cusqa.yaml +++ b/values_cusqa.yaml @@ -28,7 +28,7 @@ tenant: - name: MINIO_PROMETHEUS_AUTH_TYPE value: "public" - name: MINIO_PROMETHEUS_JOB_ID - value: "minio" + value: "minio-cusqa" - name: MINIO_PROMETHEUS_URL value: "http://kube-prometheus-stack-prometheus.monitoring:9090" - name: CONSOLE_PROMETHEUS_URL diff --git a/values_nsodev.yaml b/values_nsodev.yaml index e2c1234..9992e42 100644 --- a/values_nsodev.yaml +++ b/values_nsodev.yaml @@ -26,7 +26,7 @@ tenant: - name: MINIO_PROMETHEUS_AUTH_TYPE value: "public" - name: MINIO_PROMETHEUS_JOB_ID - value: "minio" + value: "minio-nsodev" - name: MINIO_PROMETHEUS_URL value: "http://kube-prometheus-stack-prometheus.monitoring:9090" - name: CONSOLE_PROMETHEUS_URL