Merge branch 'main' into NO-JIRA-fix-bitstring-encoding

hyperledger · Jul 29, 2024 · d5cda43 · d5cda43
2 parents 173e241 + cf3ccbe
commit d5cda43
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 0 deletions.
diff --git a/infrastructure/charts/agent/templates/podmonitor-postgresql.yaml b/infrastructure/charts/agent/templates/podmonitor-postgresql.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.database.postgres.metrics.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: postgres-metrics
+  namespace: {{ .Release.Namespace }}
+spec:
+  podMetricsEndpoints:
+    - path: /metrics
+      port: exporter
+  selector:
+    matchLabels:
+      application: spilo
+{{- end }}
diff --git a/infrastructure/charts/agent/templates/postgresql.yaml b/infrastructure/charts/agent/templates/postgresql.yaml
@@ -38,6 +38,31 @@ spec:
     agent: agent-admin
   postgresql:
     version: "14"
+{{- if .Values.database.postgres.metrics.enabled }}
+  sidecars:
+    - name: exporter
+      image: "{{ .Values.database.postgres.metrics.image.repository }}/{{ .Values.database.postgres.metrics.image.tag }}:{{ .Values.database.postgres.metrics.image.version }}"
+      args:
+        - --collector.stat_statements
+      ports:
+        - name: exporter
+          containerPort: 9187
+          protocol: TCP
+      resources:
+        limits:
+          cpu: 500m
+          memory: 256M
+        requests:
+          cpu: 100m
+          memory: 256M
+      env:
+        - name: DATA_SOURCE_URI
+          value: "127.0.0.1:5432"
+        - name: DATA_SOURCE_USER
+          value: "$(POSTGRES_USER)"
+        - name: DATA_SOURCE_PASS
+          value: "$(POSTGRES_PASSWORD)"
+{{- end }}
 
 {{- if .Values.keycloak.enabled }}
 ---

diff --git a/infrastructure/charts/agent/values.yaml b/infrastructure/charts/agent/values.yaml
@@ -67,6 +67,12 @@ server:
 
 database:
   postgres:
+    metrics:
+      enabled: false
+      image:
+        repository: quay.io/prometheuscommunity
+        tag: postgres-exporter
+        version: v0.15.0
     managingTeam: atala
     databaseSize: 4Gi
     numberOfInstances: 2