chore(postgresql-cluster): add metrics

Author: EamonZhang

addons/postgresql-cluster/15/chart/postgresql/Chart.yaml

@@ -17,11 +17,12 @@ keywords:
   - sql
   - replication
   - cluster
+  - patroni
 maintainers:
   - email: zhang.eamon@hotmail.com
     name: zhangeamon
 name: postgresql
 sources:
   - https://github.com/drycc-addons/
   - https://www.postgresql.org/
-version: 15.4.1
+version: 15.3.1

addons/postgresql-cluster/15/chart/postgresql/templates/metrics-svc.yaml

@@ -0,0 +1,31 @@
+{{- if .Values.metrics.enabled }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ printf "%s-metrics" (include "patroni.fullname" .) }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: metrics
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
+    {{- end }}
+  annotations:
+    {{- if .Values.commonAnnotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+    {{- end }}
+    {{- if .Values.metrics.service.annotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.service.annotations "context" $ ) | nindent 4 }}
+    {{- end }}
+spec:
+  type: ClusterIP
+  sessionAffinity: {{ .Values.metrics.service.sessionAffinity }}
+  {{- if .Values.metrics.service.clusterIP }}
+  clusterIP: {{ .Values.metrics.service.clusterIP }}
+  {{- end }}
+  ports:
+    - name: http-metrics
+      port: {{ .Values.metrics.service.ports.metrics }}
+      targetPort: http-metrics
+  selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
+    app.kubernetes.io/component: patroni
+{{- end }}

addons/postgresql-cluster/15/chart/postgresql/templates/statefulset.yaml

@@ -3,7 +3,8 @@ kind: StatefulSet
 metadata:
   name: {{ template "patroni.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
-  labels:
+  labels:  {{- include "common.labels.standard" . | nindent 4 }}
+    app.kubernetes.io/component: patroni
     app: {{ template "patroni.fullname" . }}
     chart: {{ template "patroni.chart" . }}
     release: {{ .Release.Name }}
@@ -13,14 +14,16 @@ spec:
   serviceName: {{ template "patroni.fullname" . }}
   replicas: {{ .Values.replicaCount }}
   selector:
-    matchLabels:
+    matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
+      app.kubernetes.io/component: patroni
       app: {{ template "patroni.fullname" . }}
       release: {{ .Release.Name }}
       cluster-name: {{ template "patroni.fullname" . }}
   template:
     metadata:
       name: {{ template "patroni.fullname" . }}
-      labels:
+      labels: {{- include "common.labels.standard" . | nindent 8 }}
+        app.kubernetes.io/component: patroni
         app: {{ template "patroni.fullname" . }}
         release: {{ .Release.Name }}
         cluster-name: {{ template "patroni.fullname" . }}

addons/postgresql-cluster/15/chart/postgresql/values.yaml

@@ -133,6 +133,21 @@ metrics:
   ##           usage: "GAUGE"
   ##           description: "Size of the database in bytes"
   ##
+  service:
+    ports:
+      metrics: 9187
+    clusterIP: ""
+    ## @param metrics.service.sessionAffinity Control where client requests go, to the same pod or round-robin
+    ## Values: ClientIP or None
+    ## ref: https://kubernetes.io/docs/user-guide/services/
+    ##
+    sessionAffinity: None                                                                                                                                                                                                                                                 
+    ## @param metrics.service.annotations [object] Annotations for Prometheus to auto-discover the metrics endpoint
+    ##
+    annotations:
+      prometheus.io/scrape: "true"
+      prometheus.io/port: "{{ .Values.metrics.service.ports.metrics }}"
+
   customMetrics: {} 
   containerPort: 9187
   containerSecurityContext:
@@ -142,7 +157,6 @@ metrics:
   customLivenessProbe: {}
   customReadinessProbe:
     enabled: true 
-  service: port
   resources: {}
 walE:
   # Specifies whether Wal-E should be enabled