From 62c9a8a247ef3be5d08f9c3ca18d6c87a3a60c23 Mon Sep 17 00:00:00 2001 From: Floppy Disk Date: Wed, 15 Jan 2025 12:09:31 +0300 Subject: [PATCH 1/2] enablePodMonitor --- packages/extra/monitoring/Chart.yaml | 2 +- packages/extra/monitoring/templates/alerta/alerta-db.yaml | 3 +++ packages/extra/versions_map | 3 ++- packages/system/keycloak/templates/db.yaml | 3 +++ packages/system/seaweedfs/templates/database.yaml | 3 +++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/extra/monitoring/Chart.yaml b/packages/extra/monitoring/Chart.yaml index e7cf49d0b..48579bcf1 100644 --- a/packages/extra/monitoring/Chart.yaml +++ b/packages/extra/monitoring/Chart.yaml @@ -3,4 +3,4 @@ name: monitoring description: Monitoring and observability stack icon: /logos/monitoring.svg type: application -version: 1.6.0 +version: 1.6.1 diff --git a/packages/extra/monitoring/templates/alerta/alerta-db.yaml b/packages/extra/monitoring/templates/alerta/alerta-db.yaml index 91c4e4aaa..397d554b8 100644 --- a/packages/extra/monitoring/templates/alerta/alerta-db.yaml +++ b/packages/extra/monitoring/templates/alerta/alerta-db.yaml @@ -11,6 +11,9 @@ spec: storageClass: {{ . }} {{- end }} + monitoring: + enablePodMonitor: true + inheritedMetadata: labels: policy.cozystack.io/allow-to-apiserver: "true" diff --git a/packages/extra/versions_map b/packages/extra/versions_map index 675ebd203..a9e366142 100644 --- a/packages/extra/versions_map +++ b/packages/extra/versions_map @@ -21,7 +21,8 @@ monitoring 1.5.1 57e90b70 monitoring 1.5.2 898374b5 monitoring 1.5.3 c1ca19dc monitoring 1.5.4 d4634797 -monitoring 1.6.0 HEAD +monitoring 1.6.0 cb7b8158 +monitoring 1.6.1 HEAD seaweedfs 0.1.0 5ca8823 seaweedfs 0.2.0 9e33dc0 seaweedfs 0.2.1 249bf35 diff --git a/packages/system/keycloak/templates/db.yaml b/packages/system/keycloak/templates/db.yaml index 0ad0e34bc..ad374bda7 100644 --- a/packages/system/keycloak/templates/db.yaml +++ b/packages/system/keycloak/templates/db.yaml @@ -7,6 +7,9 @@ spec: storage: size: 20Gi + monitoring: + enablePodMonitor: true + inheritedMetadata: labels: policy.cozystack.io/allow-to-apiserver: "true" diff --git a/packages/system/seaweedfs/templates/database.yaml b/packages/system/seaweedfs/templates/database.yaml index 1b0bbf22f..e952ff97a 100644 --- a/packages/system/seaweedfs/templates/database.yaml +++ b/packages/system/seaweedfs/templates/database.yaml @@ -8,6 +8,9 @@ spec: storage: size: 10Gi + monitoring: + enablePodMonitor: true + inheritedMetadata: labels: policy.cozystack.io/allow-to-apiserver: "true" From b7bf923822b703e07c04479b72696ae2c817d6a1 Mon Sep 17 00:00:00 2001 From: Floppy Disk Date: Wed, 15 Jan 2025 12:23:32 +0300 Subject: [PATCH 2/2] add grafana db podmonitor --- packages/extra/monitoring/templates/grafana/db.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/extra/monitoring/templates/grafana/db.yaml b/packages/extra/monitoring/templates/grafana/db.yaml index 9ec952c37..1e05a4f75 100644 --- a/packages/extra/monitoring/templates/grafana/db.yaml +++ b/packages/extra/monitoring/templates/grafana/db.yaml @@ -7,6 +7,9 @@ spec: storage: size: {{ .Values.grafana.db.size }} + monitoring: + enablePodMonitor: true + inheritedMetadata: labels: policy.cozystack.io/allow-to-apiserver: "true"