fix(prometheusRule): use the fullname as group name

Reviewed-on: #5

Chart.yaml

@@ -4,7 +4,7 @@ description: Prometheus metric exporter for PostgreSQL
 type: application
 kubeVersion: ">=1.20.0"
 version: "0.1.0"
-appVersion: "0.15.0"
+appVersion: "0.16.0"
 
 # icon: https://annotations.example.com/icon.png
 

README.md

@@ -2,19 +2,19 @@
 
 [![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/prometheus-postgres-exporter/status.svg)](https://drone.cryptic.systems/volker.raschek/prometheus-postgres-exporter)
 
+> [!NOTE]
+> This is not the official *community* helm chart of the Prometheus metric exporter for PostgreSQL databases. You can
+> find the official community chart [here](https://github.com/prometheus-community/helm-charts).
+
 This helm chart enables the deployment of a Prometheus metrics exporter for PostgreSQL databases and allows the
 individual configuration of additional containers/initContainers, mounting of volumes, defining additional environment
-variables, apply a user-defined web-config.yaml and much more.
+variables, apply a user-defined `webConfig.yaml` and much more.
 
 Chapter [configuration and installation](#helm-configuration-and-installation) describes the basics how to configure helm
 and use it to deploy the exporter. It also contains further configuration examples.
 
-Furthermore, this helm chart unit tests to detect regressions and stabilize the deployment. Additionally, this helm
+Furthermore, this helm chart contains unit tests to detect regressions and stabilize the deployment. Additionally, this
-chart is tested for deployment scenarios with ArgoCD.
+helm chart is tested for deployment scenarios with **ArgoCD**.
-
-> ![NOTE]
-> This is not the official *community* helm chart of the Prometheus metric exporter for PostgreSQL databases. You can
-> find the official community chart [here](https://github.com/prometheus-community/helm-charts).
 
 ## Helm: configuration and installation
 
@@ -31,7 +31,7 @@ chart is tested for deployment scenarios with ArgoCD.
 ```bash
 helm repo add prometheus-exporters https://charts.cryptic.systems/prometheus-exporters
 helm repo update
-helm install prometheus-exporters/prometheus-postgres-exporter prometheus-postgres-exporter \
+helm install prometheus-postgres-exporter prometheus-exporters/prometheus-postgres-exporter \
   --set 'config.database.secret.databaseUsername=postgres' \
   --set 'config.database.secret.databasePassword=postgres' \
   --set 'config.database.secret.databaseConnectionUrl="postgres.example.local:5432/postgres?ssl=disable"' \
@@ -71,7 +71,7 @@ certification will be skipped by Prometheus.
 > `tls.key` and `tls.crt` of the secret can be mounted into the container filesystem for TLS authentication / encryption.
 
 ```bash
-helm install prometheus-exporters/prometheus-postgres-exporter prometheus-postgres-exporter \
+helm install prometheus-postgres-exporter prometheus-exporters/prometheus-postgres-exporter \
   --set 'config.database.secret.databaseUsername=postgres' \
   --set 'config.database.secret.databasePassword=postgres' \
   --set 'config.database.secret.databaseConnectionUrl="postgres.example.local:5432/postgres?ssl=disable"' \
@@ -94,7 +94,7 @@ certificate for the metrics exporter - TLS certificate verification can be enabl
 replaced:
 
 ```diff
-  helm install prometheus-exporters/prometheus-postgres-exporter prometheus-postgres-exporter \
+  helm install prometheus-postgres-exporter prometheus-exporters/prometheus-postgres-exporter \
     --set 'config.database.secret.databaseUsername=postgres' \
     --set 'config.database.secret.databasePassword=postgres' \
     --set 'config.database.secret.databaseConnectionUrl="postgres.example.local:5432/postgres?ssl=disable"' \
@@ -126,25 +126,25 @@ replaced:
 
 ### Configuration
 
-| Name                                              | Description                                                                                                                                       | Value   |
+| Name                                              | Description                                                                                                                                                                            | Value   |
-| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| `config.database.existingSecret.enabled`          | Mount an existing secret containing the application specific `DATA_SOURCE_` prefixed environment variables.                                       | `false` |
+| `config.database.existingSecret.enabled`          | Mount an existing secret containing the application specific `DATA_SOURCE_` prefixed environment variables.                                                                            | `false` |
-| `config.database.existingSecret.secretName`       | Name of the existing secret containing the application specific `DATA_SOURCE_` prefixed environment variables.                                    | `""`    |
+| `config.database.existingSecret.secretName`       | Name of the existing secret containing the application specific `DATA_SOURCE_` prefixed environment variables.                                                                         | `""`    |
-| `config.database.secret.annotations`              | Additional annotations of the secret containing the database credentials.                                                                         | `{}`    |
+| `config.database.secret.annotations`              | Additional annotations of the secret containing the database credentials.                                                                                                              | `{}`    |
-| `config.database.secret.labels`                   | Additional labels of the secret containing the database credentials.                                                                              | `{}`    |
+| `config.database.secret.labels`                   | Additional labels of the secret containing the database credentials.                                                                                                                   | `{}`    |
-| `config.database.secret.databaseUsername`         | Database username. Will be defined as env `DATA_SOURCE_USER` as part of a secret.                                                                 | `""`    |
+| `config.database.secret.databaseUsername`         | Database username. Will be defined as env `DATA_SOURCE_USER` as part of a secret.                                                                                                      | `""`    |
-| `config.database.secret.databasePassword`         | Database password. Will be defined as env `DATA_SOURCE_PASS` as part of a secret.                                                                 | `""`    |
+| `config.database.secret.databasePassword`         | Database password. Will be defined as env `DATA_SOURCE_PASS` as part of a secret.                                                                                                      | `""`    |
-| `config.database.secret.databaseConnectionUrl`    | Complex database connection URL. Will be defined as env `DATA_SOURCE_URI` as part of a secret.                                                    | `""`    |
+| `config.database.secret.databaseConnectionUrl`    | Complex database connection URL. Will be defined as env `DATA_SOURCE_URI` as part of a secret.                                                                                         | `""`    |
-| `config.exporterConfig.existingSecret.enabled`    | Mount an existing secret containing the key `exporterConfig.yaml`.                                                                                | `false` |
+| `config.exporterConfig.existingSecret.enabled`    | Mount an existing secret containing the key `exporterConfig.yaml`.                                                                                                                     | `false` |
-| `config.exporterConfig.existingSecret.secretName` | Name of the existing secret containing the key `exporterConfig.yaml`.                                                                             | `""`    |
+| `config.exporterConfig.existingSecret.secretName` | Name of the existing secret containing the key `exporterConfig.yaml`.                                                                                                                  | `""`    |
-| `config.exporterConfig.secret.annotations`        | Additional annotations of the secret containing the `exporterConfig.yaml`.                                                                        | `{}`    |
+| `config.exporterConfig.secret.annotations`        | Additional annotations of the secret containing the `exporterConfig.yaml`.                                                                                                             | `{}`    |
-| `config.exporterConfig.secret.labels`             | Additional labels of the secret containing the `exporterConfig.yaml`.                                                                             | `{}`    |
+| `config.exporterConfig.secret.labels`             | Additional labels of the secret containing the `exporterConfig.yaml`.                                                                                                                  | `{}`    |
-| `config.exporterConfig.secret.exporterConfig`     | Content of the `exporterConfig.yaml`. Further information can be found [here](https://prometheus.io/docs/prometheus/latest/configuration/https/). | `{}`    |
+| `config.exporterConfig.secret.exporterConfig`     | Content of the `exporterConfig.yaml`. Further information can be found [here](https://github.com/prometheus-community/postgres_exporter?tab=readme-ov-file#multi-target-support-beta). | `{}`    |
-| `config.webConfig.existingSecret.enabled`         | Mount an existing secret containing the key `webConfig.yaml`.                                                                                     | `false` |
+| `config.webConfig.existingSecret.enabled`         | Mount an existing secret containing the key `webConfig.yaml`.                                                                                                                          | `false` |
-| `config.webConfig.existingSecret.secretName`      | Name of the existing secret containing the key `webConfig.yaml`.                                                                                  | `""`    |
+| `config.webConfig.existingSecret.secretName`      | Name of the existing secret containing the key `webConfig.yaml`.                                                                                                                       | `""`    |
-| `config.webConfig.secret.annotations`             | Additional annotations of the secret containing the `webConfig.yaml`.                                                                             | `{}`    |
+| `config.webConfig.secret.annotations`             | Additional annotations of the secret containing the `webConfig.yaml`.                                                                                                                  | `{}`    |
-| `config.webConfig.secret.labels`                  | Additional labels of the secret containing the `webConfig.yaml`.                                                                                  | `{}`    |
+| `config.webConfig.secret.labels`                  | Additional labels of the secret containing the `webConfig.yaml`.                                                                                                                       | `{}`    |
-| `config.webConfig.secret.webConfig`               | Content of the `webConfig.yaml`. Further information can be found [here](https://prometheus.io/docs/prometheus/latest/configuration/https/).      | `{}`    |
+| `config.webConfig.secret.webConfig`               | Content of the `webConfig.yaml`. Further information can be found [here](https://prometheus.io/docs/prometheus/latest/configuration/https/).                                           | `{}`    |
 
 ### Deployment
 
@@ -221,7 +221,7 @@ replaced:
 | `prometheus.metrics.enabled`                        | Enable of scraping metrics by Prometheus.                                                                                                    | `true`     |
 | `prometheus.metrics.podMonitor.enabled`             | Enable creation of a podMonitor. Excludes the existence of a serviceMonitor resource.                                                        | `false`    |
 | `prometheus.metrics.podMonitor.annotations`         | Additional podMonitor annotations.                                                                                                           | `{}`       |
-| `prometheus.metrics.podMonitor.enableHttp2`         | Enable HTTP2.                                                                                                                                | `false`    |
+| `prometheus.metrics.podMonitor.enableHttp2`         | Enable HTTP2.                                                                                                                                | `true`     |
 | `prometheus.metrics.podMonitor.followRedirects`     | FollowRedirects configures whether scrape requests follow HTTP 3xx redirects.                                                                | `false`    |
 | `prometheus.metrics.podMonitor.honorLabels`         | Honor labels.                                                                                                                                | `false`    |
 | `prometheus.metrics.podMonitor.labels`              | Additional podMonitor labels.                                                                                                                | `{}`       |
@@ -234,12 +234,11 @@ replaced:
 | `prometheus.metrics.serviceMonitor.enabled`         | Enable creation of a serviceMonitor. Excludes the existence of a podMonitor resource.                                                        | `false`    |
 | `prometheus.metrics.serviceMonitor.annotations`     | Additional serviceMonitor annotations.                                                                                                       | `{}`       |
 | `prometheus.metrics.serviceMonitor.labels`          | Additional serviceMonitor labels.                                                                                                            | `{}`       |
-| `prometheus.metrics.serviceMonitor.enableHttp2`     | Enable HTTP2.                                                                                                                                | `false`    |
+| `prometheus.metrics.serviceMonitor.enableHttp2`     | Enable HTTP2.                                                                                                                                | `true`     |
 | `prometheus.metrics.serviceMonitor.followRedirects` | FollowRedirects configures whether scrape requests follow HTTP 3xx redirects.                                                                | `false`    |
 | `prometheus.metrics.serviceMonitor.honorLabels`     | Honor labels.                                                                                                                                | `false`    |
 | `prometheus.metrics.serviceMonitor.interval`        | Interval at which metrics should be scraped. If not specified Prometheus' global scrape interval is used.                                    | `60s`      |
 | `prometheus.metrics.serviceMonitor.path`            | HTTP path for scraping Prometheus metrics.                                                                                                   | `/metrics` |
-| `prometheus.metrics.serviceMonitor.port`            | HTTP port for scraping Prometheus metrics.                                                                                                   | `9187`     |
 | `prometheus.metrics.serviceMonitor.relabelings`     | RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields. | `[]`       |
 | `prometheus.metrics.serviceMonitor.scrapeTimeout`   | Timeout after which the scrape is ended. If not specified, global Prometheus scrape timeout is used.                                         | `30s`      |
 | `prometheus.metrics.serviceMonitor.scheme`          | HTTP scheme to use for scraping. For example `http` or `https`.                                                                              | `http`     |

renovate.json

@@ -24,10 +24,10 @@
       "matchUpdateTypes": [ "minor", "patch"]
     },
     {
-      "addLabels": [ "renovate/prometheus-postgres-exporter", "renovate/automerge" ],
+      "addLabels": [ "renovate/markdownlint", "renovate/automerge" ],
       "automerge": true,
-      "matchPackageNames": [ "prometheus-postgres-exporter" ],
+      "matchPackageNames": [ "markdownlint-cli", "@bitnami/readme-generator-for-helm" ],
-      "matchManagers": [ "regex" ],
+      "matchManagers": [ "npm" ],
       "matchUpdateTypes": [ "minor", "patch"]
     }
   ],

templates/prometheus-postgres-exporter/_deployment.tpl

@@ -52,15 +52,15 @@
 {{/* volumeMounts */}}
 
 {{- define "prometheus-postgres-exporter.deployment.volumeMounts" -}}
-{{- $volumeMounts := dict "volumeMounts" (.Values.deployment.postgresExporter.volumeMounts | default (list) ) }}
+{{- $volumeMounts := .Values.deployment.postgresExporter.volumeMounts | default list  }}
-{{- $volumeMounts = merge $volumeMounts (dict "volumeMounts" (list (dict "name" "config.d" "mountPath" "/etc/prometheus-postgres-exporter/config.d" ))) }}
+{{- $volumeMounts = concat $volumeMounts (list (dict "name" "config-d" "mountPath" "/etc/prometheus-postgres-exporter/config.d" )) }}
-{{ toYaml $volumeMounts }}
+{{ toYaml (dict "volumeMounts" $volumeMounts) }}
 {{- end -}}
 
 {{/* volumes */}}
 
 {{- define "prometheus-postgres-exporter.deployment.volumes" -}}
-{{- $volumes := dict "volumes" (.Values.deployment.volumes | default (list) ) }}
+{{- $volumes := .Values.deployment.volumes | default list }}
 
 {{- $exporterSecretName := .Values.config.exporterConfig.existingSecret.secretName -}}
 {{- if not .Values.config.exporterConfig.existingSecret.enabled }}
@@ -72,8 +72,8 @@
 {{- $webConfigSecretName = printf "%s-web-config" (include "prometheus-postgres-exporter.fullname" . ) }}
 {{- end }}
 
-{{- $volumes = merge $volumes (dict "volumes" (list (dict "name" "config.d" "projected" (dict "defaultMode" "0444" "sources" (list (dict "secret" (dict "name" $exporterSecretName)) (dict "secret" (dict "name" $webConfigSecretName))))))) }}
+{{- $volumes = concat $volumes (list (dict "name" "config-d" "projected" (dict "defaultMode" 444 "sources" (list (dict "secret" (dict "name" $exporterSecretName)) (dict "secret" (dict "name" $webConfigSecretName)))))) }}
 
-{{ toYaml $volumes }}
+{{ toYaml (dict "volumes" $volumes) }}
 
 {{- end -}}

templates/prometheus-postgres-exporter/_pod.tpl

@@ -13,5 +13,5 @@
 {{- end }}
 
 {{- define "prometheus-postgres-exporter.pod.selectorLabels" -}}
-{{ include "prometheus-postgres-exporter.pod.labels" . }}
+{{ include "prometheus-postgres-exporter.selectorLabels" . }}
 {{- end }}

templates/prometheus-postgres-exporter/deployment.yaml

@@ -24,7 +24,7 @@ spec:
       - name: postgres-exporter
         args:
         - "--config.file=/etc/prometheus-postgres-exporter/config.d/exporterConfig.yaml"
-        - "--web.config.file=/etc/prometheus-postgres-exporter/config.d/web-config.yaml"
+        - "--web.config.file=/etc/prometheus-postgres-exporter/config.d/webConfig.yaml"
         - "--web.listen-address=:9187"
         {{- range .Values.deployment.postgresExporter.args }}
         - {{ . | quote }}

templates/prometheus-postgres-exporter/prometheusRules.yaml

@@ -16,7 +16,7 @@ metadata:
 spec:
 {{- with .Values.prometheus.rules }}
   groups:
-  - name: {{ template "prometheus-postgres-exporter.name" $ }}
+  - name: {{ template "prometheus-postgres-exporter.fullname" $ }}
     rules:
     {{ toYaml . | nindent 4 }}
 {{- end }}

templates/prometheus-postgres-exporter/secretWebConfig.yaml

@@ -11,7 +11,7 @@ metadata:
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  name: {{ include "prometheus-postgres-exporter.fullname" . }}-webconfig
+  name: {{ include "prometheus-postgres-exporter.fullname" . }}-web-config
   namespace: {{ .Release.Namespace }}
 stringData:
   webConfig.yaml: |

templates/prometheus-postgres-exporter/serviceMonitorHTTP.yaml

@@ -25,8 +25,8 @@ spec:
       {{- toYaml . | nindent 6 }}
     {{- end }}
     scrapeTimeout: {{ required "The scrape timeout of the serviceMonitor is not defined!" .Values.prometheus.metrics.serviceMonitor.scrapeTimeout }}
-    scheme: {{ required "The scheme of the serviceMonitor is not defined!" .Values.prometheus.metrics.serviceMonitor.scheme}}
+    scheme: {{ required "The scheme of the serviceMonitor is not defined!" .Values.prometheus.metrics.serviceMonitor.scheme }}
-    targetPort: {{ required "The port of the serviceMonitor is not defined!" .Values.prometheus.metrics.serviceMonitor.port }}
+    targetPort: {{ required "The port of the service is not defined!" .Values.services.http.port }}
     {{- with .Values.prometheus.metrics.serviceMonitor.tlsConfig }}
     tlsConfig:
       {{- toYaml . | nindent 6 }}

unittests/deployment/deployment.yaml

@@ -36,19 +36,19 @@ tests:
       path: spec.template.spec.containers[0].args
       value:
       - --config.file=/etc/prometheus-postgres-exporter/config.d/exporterConfig.yaml
-      - --web.config.file=/etc/prometheus-postgres-exporter/config.d/web-config.yaml
+      - --web.config.file=/etc/prometheus-postgres-exporter/config.d/webConfig.yaml
       - --web.listen-address=:9187
   - equal:
       path: spec.template.spec.containers[0].volumeMounts
       value:
       - mountPath: /etc/prometheus-postgres-exporter/config.d
-        name: config.d
+        name: config-d
   - equal:
       path: spec.template.spec.volumes
       value:
-      - name: config.d
+      - name: config-d
         projected:
-          defaultMode: "0444"
+          defaultMode: 444
           sources:
           - secret:
               name: prometheus-postgres-exporter-unittest-exporter-config
@@ -101,7 +101,7 @@ tests:
       path: spec.template.spec.containers[0].args
       value:
       - --config.file=/etc/prometheus-postgres-exporter/config.d/exporterConfig.yaml
-      - --web.config.file=/etc/prometheus-postgres-exporter/config.d/web-config.yaml
+      - --web.config.file=/etc/prometheus-postgres-exporter/config.d/webConfig.yaml
       - --web.listen-address=:9187
       - --foo=bar
       - --bar=foo
@@ -143,13 +143,13 @@ tests:
       path: spec.template.spec.containers[0].volumeMounts
       value:
       - mountPath: /etc/prometheus-postgres-exporter/config.d
-        name: config.d
+        name: config-d
   - equal:
       path: spec.template.spec.volumes
       value:
-      - name: config.d
+      - name: config-d
         projected:
-          defaultMode: "0444"
+          defaultMode: 444
           sources:
           - secret:
               name: exporter-config-secret
@@ -165,13 +165,13 @@ tests:
       path: spec.template.spec.containers[0].volumeMounts
       value:
       - mountPath: /etc/prometheus-postgres-exporter/config.d
-        name: config.d
+        name: config-d
   - equal:
       path: spec.template.spec.volumes
       value:
-      - name: config.d
+      - name: config-d
         projected:
-          defaultMode: "0444"
+          defaultMode: 444
           sources:
           - secret:
               name: prometheus-postgres-exporter-unittest-exporter-config
@@ -352,14 +352,24 @@ tests:
       hostPath:
         path: /usr/lib/prometheus-postgres-exporter/data
   asserts:
-  - contains:
+  - equal:
       path: spec.template.spec.containers[0].volumeMounts
-      content:
+      value:
-        name: data
+      - name: data
         mountPath: /usr/lib/prometheus-postgres-exporter/data
-  - contains:
+      - name: config-d
+        mountPath: /etc/prometheus-postgres-exporter/config.d
+  - equal:
       path: spec.template.spec.volumes
-      content:
+      value:
-        name: data
+      - name: data
         hostPath:
           path: /usr/lib/prometheus-postgres-exporter/data
+      - name: config-d
+        projected:
+          defaultMode: 444
+          sources:
+          - secret:
+              name: prometheus-postgres-exporter-unittest-exporter-config
+          - secret:
+              name: prometheus-postgres-exporter-unittest-web-config

unittests/podMonitors/podMonitorHTTP.yaml

@@ -58,7 +58,7 @@ tests:
         helm.sh/chart: prometheus-postgres-exporter-0.1.0
   - equal:
       path: spec.podMetricsEndpoints[0].enableHttp2
-      value: false
+      value: true
   - equal:
       path: spec.podMetricsEndpoints[0].followRedirects
       value: false
@@ -90,10 +90,7 @@ tests:
       path: spec.selector.matchLabels
       value:
         app.kubernetes.io/instance: prometheus-postgres-exporter-unittest
-        app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: prometheus-postgres-exporter
-        app.kubernetes.io/version: 0.1.0
-        helm.sh/chart: prometheus-postgres-exporter-0.1.0
 
 - it: Render podMonitor with custom annotations and labels.
   set:
@@ -122,7 +119,7 @@ tests:
   set:
     prometheus.metrics.enabled: true
     prometheus.metrics.podMonitor.enabled: true
-    prometheus.metrics.podMonitor.enableHttp2: true
+    prometheus.metrics.podMonitor.enableHttp2: false
     prometheus.metrics.podMonitor.followRedirects: true
     prometheus.metrics.podMonitor.honorLabels: true
     prometheus.metrics.podMonitor.interval: "180s"
@@ -140,7 +137,7 @@ tests:
       count: 1
   - equal:
       path: spec.podMetricsEndpoints[0].enableHttp2
-      value: true
+      value: false
   - equal:
       path: spec.podMetricsEndpoints[0].followRedirects
       value: true

unittests/secrets/webconfig.yaml

@@ -15,7 +15,7 @@ tests:
   - containsDocument:
       apiVersion: v1
       kind: Secret
-      name: prometheus-postgres-exporter-unittest-webconfig
+      name: prometheus-postgres-exporter-unittest-web-config
       namespace: testing
   - notExists:
       path: metadata.annotations

unittests/serviceMonitors/serviceMonitorHTTP.yaml

@@ -59,7 +59,7 @@ tests:
         helm.sh/chart: prometheus-postgres-exporter-0.1.0
   - equal:
       path: spec.endpoints[0].enableHttp2
-      value: false
+      value: true
   - equal:
       path: spec.endpoints[0].followRedirects
       value: false
@@ -121,7 +121,7 @@ tests:
   set:
     prometheus.metrics.enabled: true
     prometheus.metrics.serviceMonitor.enabled: true
-    prometheus.metrics.serviceMonitor.enableHttp2: true
+    prometheus.metrics.serviceMonitor.enableHttp2: false
     prometheus.metrics.serviceMonitor.followRedirects: true
     prometheus.metrics.serviceMonitor.honorLabels: true
     prometheus.metrics.serviceMonitor.interval: "180s"
@@ -134,13 +134,12 @@ tests:
       action: "drop"
     prometheus.metrics.serviceMonitor.scrapeTimeout: "5s"
     prometheus.metrics.serviceMonitor.scheme: "http"
-    prometheus.metrics.serviceMonitor.port: 10443
   asserts:
   - hasDocuments:
       count: 1
   - equal:
       path: spec.endpoints[0].enableHttp2
-      value: true
+      value: false
   - equal:
       path: spec.endpoints[0].followRedirects
       value: true
@@ -167,6 +166,3 @@ tests:
   - equal:
       path: spec.endpoints[0].scheme
       value: http
-  - equal:
-      path: spec.endpoints[0].targetPort
-      value: 10443

unittests/services/http.yaml

@@ -63,10 +63,7 @@ tests:
       path: spec.selector
       value:
         app.kubernetes.io/instance: prometheus-postgres-exporter-unittest
-        app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/name: prometheus-postgres-exporter
-        app.kubernetes.io/version: 0.1.0
-        helm.sh/chart: prometheus-postgres-exporter-0.1.0
   - equal:
       path: spec.sessionAffinity
       value: None

values.yaml

@@ -38,7 +38,7 @@ config:
 
     ## @param config.exporterConfig.secret.annotations Additional annotations of the secret containing the `exporterConfig.yaml`.
     ## @param config.exporterConfig.secret.labels Additional labels of the secret containing the `exporterConfig.yaml`.
-    ## @param config.exporterConfig.secret.exporterConfig Content of the `exporterConfig.yaml`. Further information can be found [here](https://prometheus.io/docs/prometheus/latest/configuration/https/).
+    ## @param config.exporterConfig.secret.exporterConfig Content of the `exporterConfig.yaml`. Further information can be found [here](https://github.com/prometheus-community/postgres_exporter?tab=readme-ov-file#multi-target-support-beta).
     ## @skip config.exporterConfig.secret.exporterConfig Skip individual postgres exporter configuration.
     secret:
       annotations: {}
@@ -313,7 +313,7 @@ prometheus:
     podMonitor:
       enabled: false
       annotations: {}
-      enableHttp2: false
+      enableHttp2: true
       followRedirects: false
       honorLabels: false
       labels: {}
@@ -332,7 +332,6 @@ prometheus:
     ## @param prometheus.metrics.serviceMonitor.honorLabels Honor labels.
     ## @param prometheus.metrics.serviceMonitor.interval Interval at which metrics should be scraped. If not specified Prometheus' global scrape interval is used.
     ## @param prometheus.metrics.serviceMonitor.path HTTP path for scraping prometheus metrics.
-    ## @param prometheus.metrics.serviceMonitor.port HTTP port for scraping prometheus metrics.
     ## @param prometheus.metrics.serviceMonitor.relabelings RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields.
     ## @param prometheus.metrics.serviceMonitor.scrapeTimeout Timeout after which the scrape is ended. If not specified, global Prometheus scrape timeout is used.
     ## @param prometheus.metrics.serviceMonitor.scheme HTTP scheme to use for scraping. For example `http` or `https`.
@@ -342,12 +341,11 @@ prometheus:
       enabled: false
       annotations: {}
       labels: {}
-      enableHttp2: false
+      enableHttp2: true
       followRedirects: false
       honorLabels: false
       interval: "60s"
       path: "/metrics"
-      port: 9187
       relabelings: []
       scrapeTimeout: "30s"
       scheme: "http"