fix(chart): remove PostgreSQL exporter sidecars (#4017)

Co-authored-by: Michael Guarino <mjg@plural.sh>

Author: plural-copilot[bot]

charts/plural/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: plural
 description: A helm chart for installing plural
 appVersion: 0.11.8
-version: 0.10.109
+version: 0.10.110
 dependencies:
   - name: hydra
     version: 0.26.5

charts/plural/templates/_helpers.tpl

@@ -56,11 +56,14 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
   valueFrom:
     fieldRef:
       fieldPath: status.podIP
+{{/* These values reference the chart-managed Zalando PostgreSQL cluster. */}}
+{{ if .Values.postgres.create }}
 - name: POSTGRES_PASSWORD
   valueFrom:
     secretKeyRef:
       name: {{ .Values.dbPasswordSecret }}
       key: password
+{{ end }}
 - name: RABBIT_USERNAME
   valueFrom:
     secretKeyRef:
@@ -78,10 +81,12 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
       key: influxdb-password
 - name: RABBIT_NAMESPACE
   value: {{ .Values.rabbitmqNamespace }}
+{{ if .Values.postgres.create }}
 - name: DBHOST
   value: plural-plural
 - name: DBSSL
   value: 'true'
+{{ end }}
 {{ if .Values.sentryDsn }}
 - name: SENTRY_DSN
   value: {{ .Values.sentryDsn | quote }}

charts/plural/templates/dashboards.yaml

@@ -39,63 +39,3 @@ spec:
       legend: reductions
     format: none
     name: runtime performance
----
-apiVersion: platform.plural.sh/v1alpha1
-kind: Dashboard
-metadata:
-  name: {{ template "plural.fullname" $ }}-postgres
-  labels:
-{{ include "plural.labels" . | indent 4 }}
-spec:
-  name: postgres
-  description: Monitoring for plural's postgres db
-  timeslices: [30m, 1h, 2h, 1d]
-  defaultTime: 30m
-  labels:
-  - name: instance
-    query:
-      query: pg_stat_database_tup_fetched{namespace="{{ .Release.Namespace }}"}
-      label: instance
-  graphs:
-  - queries:
-    - query: SUM(pg_stat_database_tup_fetched{instance=~"$instance"})
-      legend: tuples fetched
-    - query: SUM(pg_stat_database_tup_inserted{instance=~"$instance"})
-      legend: tuples inserted
-    - query: SUM(pg_stat_database_tup_updated{instance=~"$instance"})
-      legend: tuples updated
-    name: Storage Performance
-  - queries:
-    - query: pg_settings_max_connections{instance="$instance"}
-      legend: connections
-    name: Max Connections
-  - queries:
-    - query: avg(rate(process_cpu_seconds_total{instance="$instance"}[5m]) * 1000)
-      legend: seconds
-    name: CPU time
-  - queries:
-    - query: avg(rate(process_resident_memory_bytes{instance="$instance"}[5m]))
-      legend: resident mem
-    - query: avg(rate(process_virtual_memory_bytes{instance="$instance"}[5m]))
-      legend: process mem
-    format: bytes
-    name: Memory utilization
-  - queries:
-    - query: process_open_fds{instance="$instance"}
-      legend: fds
-    name: Open file descriptors
-  - queries:
-    - query: pg_settings_max_wal_size_bytes{instance="$instance"}
-      legend: WAL size
-    format: bytes
-    name: Max WAL size
-  - queries:
-    - query: irate(pg_stat_database_xact_commit{instance="$instance"}[5m])
-      legend: commits
-    - query: irate(pg_stat_database_xact_rollback{instance="$instance"}[5m])
-      legend: rollbacks
-    name: Transactions
-  - queries:
-    - query: pg_stat_database_blks_hit{instance="$instance"} / (pg_stat_database_blks_read{instance="$instance"} + pg_stat_database_blks_hit{instance="$instance"})
-      legend: hit rate
-    name: Cache hit rate

charts/plural/templates/hydra-postgres.yaml

@@ -32,47 +32,6 @@ spec:
   tolerations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  sidecars:
-  - image: gcr.io/pluralsh/postgres-exporter:0.8.0
-    name: exporter
-    ports:
-    - containerPort: 9187
-      name: http-metrics
-      protocol: TCP
-    env:
-    - name: "DATA_SOURCE_URI"
-      value: "127.0.0.1:5432/hydra?sslmode=disable"
-    - name: "DATA_SOURCE_USER"
-      valueFrom:
-        secretKeyRef:
-          name: postgres.plural-hydra.credentials.postgresql.acid.zalan.do
-          key: username
-    - name: "DATA_SOURCE_PASS"
-      valueFrom:
-        secretKeyRef:
-          name: postgres.plural-hydra.credentials.postgresql.acid.zalan.do
-          key: password
-    livenessProbe:
-      failureThreshold: 6
-      httpGet:
-        path: /
-        port: http-metrics
-        scheme: HTTP
-      initialDelaySeconds: 5
-      periodSeconds: 10
-      successThreshold: 1
-      timeoutSeconds: 5
-    readinessProbe:
-      livenessProbe:
-      failureThreshold: 6
-      httpGet:
-        path: /
-        port: http-metrics
-        scheme: HTTP
-      initialDelaySeconds: 5
-      periodSeconds: 10
-      successThreshold: 1
-      timeoutSeconds: 5
 ---
 apiVersion: v1
 kind: Service
@@ -87,9 +46,6 @@ spec:
   - name: postgres
     port: 5432
     targetPort: 5432
-  - name: http-metrics
-    port: 9187
-    targetPort: http-metrics
   selector:
     spilo-role: master
     cluster-name: plural-hydra

charts/plural/templates/postgres.yaml

@@ -34,47 +34,6 @@ spec:
   tolerations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  sidecars:
-  - image: gcr.io/pluralsh/postgres-exporter:0.8.0
-    name: exporter
-    ports:
-    - containerPort: 9187
-      name: http-metrics
-      protocol: TCP
-    env:
-    - name: "DATA_SOURCE_URI"
-      value: "127.0.0.1:5432/plural?sslmode=disable"
-    - name: "DATA_SOURCE_USER"
-      valueFrom:
-        secretKeyRef:
-          name: postgres.plural-plural.credentials.postgresql.acid.zalan.do
-          key: username
-    - name: "DATA_SOURCE_PASS"
-      valueFrom:
-        secretKeyRef:
-          name: postgres.plural-plural.credentials.postgresql.acid.zalan.do
-          key: password
-    livenessProbe:
-      failureThreshold: 6
-      httpGet:
-        path: /
-        port: http-metrics
-        scheme: HTTP
-      initialDelaySeconds: 5
-      periodSeconds: 10
-      successThreshold: 1
-      timeoutSeconds: 5
-    readinessProbe:
-      livenessProbe:
-      failureThreshold: 6
-      httpGet:
-        path: /
-        port: http-metrics
-        scheme: HTTP
-      initialDelaySeconds: 5
-      periodSeconds: 10
-      successThreshold: 1
-      timeoutSeconds: 5
 ---
 apiVersion: v1
 kind: Service
@@ -89,9 +48,6 @@ spec:
   - name: postgres
     port: 5432
     targetPort: 5432
-  - name: http-metrics
-    port: 9187
-    targetPort: http-metrics
   selector:
     spilo-role: master
     cluster-name: plural-plural
@@ -103,18 +59,12 @@ metadata:
   labels:
     spilo-role: master
     {{ include "plural.labels" . | nindent 4 }}
-  annotations:
-    prometheus.io/scrape: "true"
-    prometheus.io/port: "9187"
 spec:
   type: ClusterIP
   ports:
   - name: postgres
     port: 5432
     targetPort: 5432
-  - name: http-metrics
-    port: 9187
-    targetPort: http-metrics
   selector:
     spilo-role: master
 ---
@@ -125,18 +75,12 @@ metadata:
   labels:
     spilo-role: replica
     {{ include "plural.labels" . | nindent 4 }}
-  annotations:
-    prometheus.io/scrape: "true"
-    prometheus.io/port: "9187"
 spec:
   type: ClusterIP
   ports:
   - name: postgres
     port: 5432
     targetPort: 5432
-  - name: http-metrics
-    port: 9187
-    targetPort: http-metrics
   selector:
     spilo-role: replica
     cluster-name: plural-plural

charts/plural/values.yaml

@@ -413,14 +413,6 @@ postgresql:
     registry: gcr.io
     repository: pluralsh/postgres
     tag: 11.7.0-debian-10-r9
-  metrics:
-    enabled: true
-    image:
-      registry: gcr.io
-      repository: pluralsh/postgres-exporter
-      tag: 0.8.0
-    serviceMonitor:
-      enabled: true
   postgresqlExtendedConf:
     max_connections: 100
   postgresqlUsername: plural