fix: 🐛 podmonitor definition

Author: Falltrades

charts/dso-cnpg/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: cpn-cnpg
 description: A Helm Chart to deploy easily a CNPG cluster
 type: application
-version: 2.3.2
+version: 2.3.3
 appVersion: 1.0.0
 keywords: []
 home: https://cloud-pi-native.fr

charts/dso-cnpg/README.md

@@ -1,6 +1,6 @@
 # cpn-cnpg
 
-![Version: 2.3.2](https://img.shields.io/badge/Version-2.3.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
+![Version: 2.3.3](https://img.shields.io/badge/Version-2.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
 
 A Helm Chart to deploy easily a CNPG cluster
 
@@ -56,11 +56,8 @@ A Helm Chart to deploy easily a CNPG cluster
 | instances | int | `3` | Number of instances to spawn in the cluster. |
 | labels | object | `{}` | Additional cnpg cluster labels. |
 | mode | string | `"primary"` | Mode used to deploy the cnpg cluster, it should be `primary`, `replica` or `restore`. |
-| monitoring | object | `{"enabled":false,"podMonitorAdditionalLabels":{},"podMonitorMetricRelabelings":[],"podMonitorRelabelings":[]}` | Whether or not PodMonitor should be deployed. |
+| monitoring | object | `{"enabled":false}` | Whether or not PodMonitor should be deployed. |
 | monitoring.enabled | bool | `false` | Specifies whether the monitoring should be enabled. Requires Prometheus Operator CRDs. |
-| monitoring.podMonitorAdditionalLabels | object | `{}` | Additional labels for the podMonitor |
-| monitoring.podMonitorMetricRelabelings | list | `[]` | Metrics relabel configurations to apply to samples before ingestion. |
-| monitoring.podMonitorRelabelings | list | `[]` | Relabel configurations to apply to samples before scraping. |
 | nameOverride | string | `""` | Provide a name in place of the default application name. |
 | nodePort | string | `nil` | Port used for NodePort service. Needs `exposed` tu be true. |
 | parameters | object | `{}` | Customize Postgresql parameters. |

charts/dso-cnpg/templates/pg-cluster.yaml

@@ -126,3 +126,5 @@ spec:
       {{- end }}
     retentionPolicy: {{ .Values.backup.retentionPolicy }}
   {{- end }}
+  monitoring:
+    enablePodMonitor: {{ .Values.monitoring.enabled }}

charts/dso-cnpg/templates/podmonitor.yaml

@@ -132,12 +132,6 @@ pooler:
 monitoring:
   # -- Specifies whether the monitoring should be enabled. Requires Prometheus Operator CRDs.
   enabled: false
-  # -- Metrics relabel configurations to apply to samples before ingestion.
-  podMonitorMetricRelabelings: []
-  # -- Relabel configurations to apply to samples before scraping.
-  podMonitorRelabelings: []
-  # -- Additional labels for the podMonitor
-  podMonitorAdditionalLabels: {}
 
 # CNPG operator configuration
 cnpg-operator: