fix(deployment): template affinity

Reviewed-on: #7

.drone.yml

@@ -17,16 +17,7 @@ steps:
 - name: helm lint
   commands:
   - helm lint
-  image: git.cryptic.systems/volker.raschek/helm:3.16.1
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
-
-- name: markdown lint
-  commands:
-  - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.42.0
+  image: git.cryptic.systems/volker.raschek/helm:3.16.3
   resources:
     limits:
       cpu: 150
@@ -78,7 +69,7 @@ steps:
 - name: helm unittest
   commands:
   - helm unittest --strict --file 'unittests/**/*.yaml' ./
-  image: git.cryptic.systems/volker.raschek/helm:3.16.1
+  image: git.cryptic.systems/volker.raschek/helm:3.16.3
   resources:
     limits:
       cpu: 150
@@ -114,7 +105,7 @@ trigger:
 ---
 kind: pipeline
 type: kubernetes
-name: Generate README.md
+name: Generate, compare and lint README.md
 
 clone:
   disable: true
@@ -127,12 +118,13 @@ steps:
 - name: clone repository
   image: git.cryptic.systems/volker.raschek/git:1.4.0
 
-- name: generate README
+- name: execute NPM modules
   commands:
   - npm install
-  - npm run readme:parameters
+  - npm run readme:link
   - npm run readme:lint
-  image: docker.io/library/node:22.11.0-alpine
+  - npm run readme:parameters
+  image: docker.io/library/node:23.3.0-alpine
   resources:
     limits:
       cpu: 150
@@ -195,7 +187,7 @@ steps:
       from_secret: helm_repo_password
     HELM_REPO_USERNAME:
       from_secret: helm_repo_username
-  image: git.cryptic.systems/volker.raschek/helm:3.16.1
+  image: git.cryptic.systems/volker.raschek/helm:3.16.3
   resources:
     limits:
       cpu: 150

.helmignore

@@ -26,7 +26,7 @@
 .vscode/
 
 # drone
-.drone.ya?ml
+.drone.yml
 
 # editorconfig
 .editorconfig
@@ -37,13 +37,24 @@ values2.yaml
 
 # helm packages
 *.tgz
+.helmignore
+unittests
 
 # markdownlint
 .markdownlint.yml
 .markdownlint.yaml
+.markdownlintignore
 
-# maven
-target
+# npm
+.prettierignore
+.npmrc
+package*
 
-# serviceDescriptor (uctl-cluster)
-serviceDescriptor.yaml
+# yamllint
+.yamllint.yaml
+
+# Others
+CONTRIBUTING.md
+CODEOWNERS
+Makefile
+renovate.json

.markdownlint.yaml

@@ -128,16 +128,18 @@ MD044:
   # List of proper names
   names:
     - Git
-    - Gitea
     - GitDevOps
+    - Gitea
     - GitHub
     - GitLab
     - GitOps
+    - kube-prometheus-stack
     - Memcached
     - Oracle
     - ORBIS U
     - PostgreSQL
     - Prometheus
+    - prometheus-exporter
     - SSL
     - TLS
   # Include code blocks

CONTRIBUTING.md

@@ -1 +1,82 @@
-# Contribution Guidelines
+# Contributing
+
+I am very happy if you would like to provide a pull request 👍
+
+The content of this file describes which requirements contributors should fulfill before submitting a pull request (PR).
+
+1. [Valid Git commits](#valid-git-commits)
+
+## Valid Git commits
+
+### Commit message
+
+The repository is subject to a strict commit message template. This states that there are several types of commits. For
+example, `fix`, `chore`, `refac`, `test` or `doc`. All types are described in more detail below.
+
+| type                | description                                                       |
+| ------------------- | ----------------------------------------------------------------- |
+| `feat`              | New feature.                                                      |
+| `fix`               | Fixes a bug.                                                      |
+| `refac`             | Refactoring production code.                                      |
+| `style`             | Fixes formatting issues. No production code change.               |
+| `docs`              | Adapt documentation. No production code change.                   |
+| `test`              | Adds new or modifies existing tests. No production code change.   |
+| `chore`             | Updating grunt tasks. Is everything which the user does not see.  |
+
+Based on these types, commit messaged can then be created. Here are a few examples:
+
+```text
+style(README): Wrong indentation
+feat(deployment): support restartPolicy
+fix(my-app): Add missing volume
+docs(CONTRIBUTING): Describe how to commit correctly
+```
+
+This type of commit message makes it easier for me as maintainer to keep an overview and does not cause the commits of a
+pull request PR to be combined into one commit (squashing).
+
+### Smart commits
+
+Smart commits are excellent when it comes to tracking bugs or issues. In this repository, however, the rebasing of
+commits is prohibited, which means that only merge commits are possible. This means that a smart commit message only
+needs to be added to the merge commit.
+
+This has the advantage that the maintainer can use the smart commit to find the merge commit and undo the entire history
+of a merge without having to select individual commits. The following history illustrates the correct use of smart commits.
+
+```text
+* 823edbc7 Volker Raschek (G) | [Close #2] feat(deployment): support additional containers
+|\
+| * 321aebc3 Volker Raschek (G) | doc(README): generate README with new deployment attributes
+| * 8d101dd3 Volker Raschek (G) | test(deployment): Extend unittest of additional containers
+| * 6f2abd93 Volker Raschek (G) | fix(deployment): Extend deployment of additional containers
+|/
+* aa5ebda bob (N) | [Close #1] feat(deployment): support initContainers
+```
+
+### Commit signing
+
+Another problem with Git is the chain of trust. Git allows the configuration of any name and e-mail address. An attacker
+can impersonate any person and submit pull requests under a false identity. For as Linux Torvalds, the maintainer of the
+Linux kernel.
+
+```bash
+git config --global user.name 'Linux Torvalds'
+git config --global user.email 'torvalds@linux-foundation.org'
+```
+
+To avoid this, some Git repositories expect signed commits. In particular, repositories that are subject to direct
+delivery to customers. For this reason, the repository is subject to a branch protection rule that only allows signed
+commits. *Until* there is *no verified* and *no signed* commit, the pull request is blocked.
+
+The following articles describes how Git can be configured to sign commits. Please keep in mind, that the e-mail
+address, which is used as UID of the GPG keyring must also be defined in the profile settings of your GitHub account.
+Otherwise will be marked the Git commit as *Unverified*.
+
+1. [Signing Commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits)
+2. [Tell Git about your signing key](https://docs.github.com/en/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key)
+
+Inspect your Git commit via `git log`. There should be mentioned, that your commit is signed.
+
+Furthermore, the GPG key is unique. **Don't loose your private GPG key**. Backup your private key on a safe device. For
+example an external USB drive.

Makefile

@@ -11,7 +11,7 @@ HELM_IMAGE_FULLY_QUALIFIED=${HELM_IMAGE_REGISTRY_HOST}/${HELM_IMAGE_REPOSITORY}:
 MARKDOWNLINKCHECK_IMAGE_REGISTRY_HOST?=ghcr.io
 MARKDOWNLINKCHECK_IMAGE_REPOSITORY=tcort/markdown-link-check
 MARKDOWNLINKCHECK_IMAGE_VERSION?=3.12.2 # renovate: datasource=docker registryUrl=https://ghcr.io depName=tcort/markdown-link-check
-MARKDOWNLINKCHECK_IMAGE_FULLY_QUALIFIED=${MARKDOWNLINT_IMAGE_REGISTRY_HOST}/${MARKDOWNLINT_IMAGE_REPOSITORY}:${MARKDOWNLINT_IMAGE_VERSION}
+MARKDOWNLINKCHECK_IMAGE_FULLY_QUALIFIED=${MARKDOWNLINKCHECK_IMAGE_REGISTRY_HOST}/${MARKDOWNLINKCHECK_IMAGE_REPOSITORY}:${MARKDOWNLINKCHECK_IMAGE_VERSION}
 
 # NODE_IMAGE
 NODE_IMAGE_REGISTRY_HOST?=docker.io
@@ -19,27 +19,39 @@ NODE_IMAGE_REPOSITORY=library/node
 NODE_IMAGE_VERSION?=22.9.0-alpine # renovate: datasource=docker registryUrl=https://docker.io depName=library/node
 NODE_IMAGE_FULLY_QUALIFIED=${NODE_IMAGE_REGISTRY_HOST}/${NODE_IMAGE_REPOSITORY}:${NODE_IMAGE_VERSION}
 
-# CHART_SERVER
-CHART_SERVER_HOST?=charts.u.orbis-healthcare.com
-CHART_SERVER_NAMESPACE?=orbis-u
-CHART_SERVER_REPOSITORY?=qu-seed
-CHART_VERSION?=0.1.0
-
 # MISSING DOT
 # ==============================================================================
 missing-dot:
 	grep --perl-regexp '## @(param|skip).*[^.]$$' values.yaml
 
-# CONTAINER RUN - PREPARE ENVIRONMENT
+# CONTAINER RUN - README
 # ==============================================================================
 PHONY+=container-run/readme
-container-run/readme:
+container-run/readme: container-run/readme/link container-run/readme/lint container-run/readme/parameters
+
+container-run/readme/link:
 	${CONTAINER_RUNTIME} run \
 		--rm \
 		--volume $(shell pwd):$(shell pwd) \
 		--workdir $(shell pwd) \
 			${NODE_IMAGE_FULLY_QUALIFIED} \
-				npm install && npm run readme:parameters && npm run readme:lint
+				npm install && npm run readme:link
+
+container-run/readme/lint:
+	${CONTAINER_RUNTIME} run \
+		--rm \
+		--volume $(shell pwd):$(shell pwd) \
+		--workdir $(shell pwd) \
+			${NODE_IMAGE_FULLY_QUALIFIED} \
+				npm install && npm run readme:lint
+
+container-run/readme/parameters:
+	${CONTAINER_RUNTIME} run \
+		--rm \
+		--volume $(shell pwd):$(shell pwd) \
+		--workdir $(shell pwd) \
+			${NODE_IMAGE_FULLY_QUALIFIED} \
+				npm install && npm run readme:parameters
 
 # CONTAINER RUN - HELM UNITTESTS
 # ==============================================================================
@@ -67,19 +79,6 @@ container-run/helm-update-dependencies:
 			${HELM_IMAGE_FULLY_QUALIFIED} \
 				dependency update
 
-# CONTAINER RUN - DEPLOY2CHART-REPO
-# ==============================================================================
-container-run/deploy2chart-repo:
-	${CONTAINER_RUNTIME} run \
-		--env HELM_REPO_PASSWORD=${CHART_SERVER_PASSWORD} \
-		--env HELM_REPO_USERNAME=${CHART_SERVER_USERNAME} \
-		--entrypoint /bin/bash \
-		--rm \
-		--volume $(shell pwd):$(shell pwd) \
-		--workdir $(shell pwd) \
-			${HELM_IMAGE_FULLY_QUALIFIED} \
-				-c "helm repo add ${CHART_SERVER_NAMESPACE} http://${CHART_SERVER_HOST}/${CHART_SERVER_NAMESPACE} && helm package --version ${CHART_VERSION} . && helm cm-push ./${CHART_SERVER_REPOSITORY}-${CHART_VERSION}.tgz ${CHART_SERVER_NAMESPACE}"
-
 # CONTAINER RUN - MARKDOWN-LINT
 # ==============================================================================
 PHONY+=container-run/helm-lint

README.md

@@ -1,21 +1,22 @@
 # Prometheus PostgreSQL exporter
 
 [![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/prometheus-postgres-exporter/status.svg)](https://drone.cryptic.systems/volker.raschek/prometheus-postgres-exporter)
-
-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.
-
-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
-chart is tested for deployment scenarios with ArgoCD.
+[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/prometheus-exporters)](https://artifacthub.io/packages/search?repo=prometheus-exporters)
 
 > [!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 `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 contains unit tests to detect regressions and stabilize the deployment. Additionally, this
+helm chart is tested for deployment scenarios with **ArgoCD**.
+
 ## Helm: configuration and installation
 
 1. A helm chart repository must be configured, to pull the helm charts from.
@@ -31,7 +32,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"' \
@@ -45,7 +46,8 @@ version of the chart must be in sync with the `values.yaml`. Newer *minor* versi
 versions can break something!
 
 ```bash
-helm show values prometheus-exporters/prometheus-postgres-exporter --version 0.1.0 > values.yaml
+CHART_VERSION=0.1.0
+helm show values prometheus-exporters/prometheus-postgres-exporter --version "${CHART_VERSION}" > values.yaml
 ```
 
 A complete list of available helm chart versions can be displayed via the following command:
@@ -61,7 +63,7 @@ for customizations. These can be configured in more detail via `values.yaml`.
 
 The following examples serve as individual configurations and as inspiration for how deployment problems can be solved.
 
-### TLS authentication and encryption
+#### TLS authentication and encryption
 
 The first example shows how to deploy the metric exporter with TLS encryption. The verification of the custom TLS
 certification will be skipped by Prometheus.
@@ -71,7 +73,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 +96,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"' \
@@ -115,6 +117,47 @@ replaced:
 +   --set 'prometheus.metrics.serviceMonitor.tlsConfig.keyFile=/etc/prometheus/tls/tls.key'
 ```
 
+#### Grafana dashboard
+
+The helm chart includes Grafana dashboards. These can be deployed as a configMap by activating Grafana integration. It
+is assumed that the dashboard is consumed by Grafana or a sidecar container itself and that the dashboard is stored in
+the Grafana container file system so that it is subsequently available to the user. The
+[kube-prometheus-stack](https://artifacthub.io/packages/helm/prometheus-community/kube-prometheus-stack) deployment
+makes this possible.
+
+```bash
+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"' \
+  --set 'grafana.enabled=true'
+```
+
+#### Avoid deploying on same node / bare metal host as PostgresDB
+
+As a best practice, avoid running the postgres-exporter on the same node / bare-metal host as the PostgresDB. This is
+because if the postgres-exporter is running on the same node and this node fails, Prometheus can send an alert about the
+failure of the node or that the postgres-exporter cannot be reached. However, it is not possible to react based on the
+metrics that the postgres-exporter explicitly provides. Depending on the configuration of alerts, this may mean that the
+corresponding notifications are not sent to the right person or group of people.
+
+The following example prevent the postgres-exporter from running on nodes with a PostgresDB. The PostgresDB nodes has an
+additional label `database=postgres`. The configuration is carried out in `values.yaml`.
+
+```yaml
+deployment:
+  affinity:
+    nodeAffinity:
+      preferredDuringSchedulingIgnoredDuringExecution:
+      - weight: 100
+        preference:
+          matchExpressions:
+          - key: database
+            operator: NotIn
+            values:
+            - postgres
+```
+
 ## Parameters
 
 ### Global
@@ -126,32 +169,32 @@ replaced:
 
 ### Configuration
 
-| Name                                              | Description                                                                                                                                       | Value   |
-| ------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| `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.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.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.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.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.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.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.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.webConfig`               | Content of the `webConfig.yaml`. Further information can be found [here](https://prometheus.io/docs/prometheus/latest/configuration/https/).      | `{}`    |
+| Name                                              | Description                                                                                                                                                                            | Value   |
+| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| `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.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.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.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.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.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://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.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.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/).                                           | `{}`    |
 
 ### Deployment
 
 | Name                                               | Description                                                                                                | Value                                   |
 | -------------------------------------------------- | ---------------------------------------------------------------------------------------------------------- | --------------------------------------- |
 | `deployment.annotations`                           | Additional deployment annotations.                                                                         | `{}`                                    |
-| `deployment.labels`                                | Additional ingress labels.                                                                                 | `{}`                                    |
+| `deployment.labels`                                | Additional deployment labels.                                                                              | `{}`                                    |
 | `deployment.additionalContainers`                  | List of additional containers.                                                                             | `[]`                                    |
 | `deployment.affinity`                              | Affinity for the postgres-exporter deployment.                                                             | `{}`                                    |
 | `deployment.initContainers`                        | List of additional init containers.                                                                        | `[]`                                    |
@@ -182,14 +225,17 @@ replaced:
 | `deployment.terminationGracePeriodSeconds`         | How long to wait until forcefully kill the pod.                                                            | `60`                                    |
 | `deployment.tolerations`                           | Tolerations of the postgres-exporter deployment.                                                           | `[]`                                    |
 | `deployment.topologySpreadConstraints`             | TopologySpreadConstraints of the postgres-exporter deployment.                                             | `[]`                                    |
-| `deployment.volumes`                               | Additional volumes to mount into the pods of the Prometheus-exporter deployment.                           | `[]`                                    |
+| `deployment.volumes`                               | Additional volumes to mount into the pods of the prometheus-exporter deployment.                           | `[]`                                    |
 
 ### Grafana
 
-| Name                                 | Description                                               | Value   |
-| ------------------------------------ | --------------------------------------------------------- | ------- |
-| `grafana.enabled`                    | Enable integration into Grafana.                          | `false` |
-| `grafana.dashboards.businessMetrics` | Enable deployment of Grafana dashboard `businessMetrics`. | `true`  |
+| Name                                              | Description                                                                                              | Value       |
+| ------------------------------------------------- | -------------------------------------------------------------------------------------------------------- | ----------- |
+| `grafana.enabled`                                 | Enable integration into Grafana. Require the Prometheus operator deployment.                             | `false`     |
+| `grafana.dashboardDiscoveryLabels`                | Labels that Grafana uses to discover resources. The labels may vary depending on the Grafana deployment. | `undefined` |
+| `grafana.dashboards.postgresExporter.enabled`     | Enable deployment of Grafana dashboard `postgresExporter`.                                               | `true`      |
+| `grafana.dashboards.postgresExporter.annotations` | Additional configmap annotations.                                                                        | `{}`        |
+| `grafana.dashboards.postgresExporter.labels`      | Additional configmap labels.                                                                             | `{}`        |
 
 ### Ingress
 
@@ -221,7 +267,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 +280,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`     |

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "qu-seed-chart",
-  "homepage": "https://github.com/dedalus-cis4u/qu-seed-chart.git",
+  "name": "prometheus-postgres-exporter",
+  "homepage": "https://git.cryptic.systems/volker.raschek/prometheus-postgres-exporter.git",
   "license": "MIT",
   "private": true,
   "engineStrict": true,
@@ -9,11 +9,13 @@
     "npm": ">=8.0.0"
   },
   "scripts": {
+    "readme:link": "markdown-link-check *.md",
     "readme:lint": "markdownlint *.md -f",
     "readme:parameters": "readme-generator -v values.yaml -r README.md"
   },
   "devDependencies": {
     "@bitnami/readme-generator-for-helm": "^2.5.0",
-    "markdownlint-cli": "^0.41.0"
+    "markdown-link-check": "^3.13.6",
+    "markdownlint-cli": "^0.43.0"
   }
 }

renovate.json

@@ -11,20 +11,34 @@
         "appVersion: \"(?<currentValue>.*?)\"\\s+"
       ],
       "datasourceTemplate": "docker",
-      "depNameTemplate": "prometheus-postgres-exporter",
-      "lookupNameTemplate": "quay.io/prometheuscommunity/postgres-exporter"
+      "depNameTemplate": "prometheuscommunity/postgres-exporter",
+      "lookupNameTemplate": "quay.io/prometheuscommunity/postgres-exporter",
+      "versioningTemplate": "semver"
+    },
+    {
+      "description": "Detect helm chart version in README",
+      "fileMatch": [
+        "^README\\.md$"
+      ],
+      "matchStrings": [
+        "^CHART_VERSION=(?<currentValue>.*)$"
+      ],
+      "datasourceTemplate": "git-tags",
+      "depNameTemplate": "volker.raschek/prometheus-postgres-exporter",
+      "packageNameTemplate": "git.cryptic.systems/volker.raschek/prometheus-postgres-exporter",
+      "versioningTemplate": "semver"
     }
   ],
   "labels": [ "renovate" ],
   "packageRules": [
     {
-      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
+      "addLabels": [ "renovate/automerge", "renovate/droneci" ],
       "automerge": true,
       "matchManagers": "droneci",
       "matchUpdateTypes": [ "minor", "patch"]
     },
     {
-      "addLabels": [ "renovate/markdownlint", "renovate/automerge" ],
+      "addLabels": [ "renovate/automerge", "renovate/npm" ],
       "automerge": true,
       "matchPackageNames": [ "markdownlint-cli", "@bitnami/readme-generator-for-helm" ],
       "matchManagers": [ "npm" ],

templates/prometheus-postgres-exporter/_configMap.tpl

@@ -0,0 +1,20 @@
+{{/* vim: set filetype=mustache: */}}
+
+{{/* annotations */}}
+
+{{- define "prometheus-postgres-exporter.configMap.grafanaDashboards.postgresExporter.annotations" -}}
+{{ include "prometheus-postgres-exporter.annotations" . }}
+{{- if .Values.grafana.dashboards.postgresExporter.annotations }}
+{{ toYaml .Values.grafana.dashboards.postgresExporter.annotations }}
+{{- end }}
+{{- end }}
+
+{{/* labels */}}
+
+{{- define "prometheus-postgres-exporter.configMap.grafanaDashboards.postgresExporter.labels" -}}
+{{ include "prometheus-postgres-exporter.labels" . }}
+{{- if .Values.grafana.dashboards.postgresExporter.labels }}
+{{ toYaml .Values.grafana.dashboards.postgresExporter.labels }}
+{{- end }}
+{{ toYaml .Values.grafana.dashboardDiscoveryLabels }}
+{{- end }}

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 = merge $volumeMounts (dict "volumeMounts" (list (dict "name" "config.d" "mountPath" "/etc/prometheus-postgres-exporter/config.d" ))) }}
-{{ toYaml $volumeMounts }}
+{{- $volumeMounts := .Values.deployment.postgresExporter.volumeMounts | default list  }}
+{{- $volumeMounts = concat $volumeMounts (list (dict "name" "config-d" "mountPath" "/etc/prometheus-postgres-exporter/config.d" )) }}
+{{ 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/deployment.yaml

@@ -12,6 +12,7 @@ metadata:
   name: {{ include "prometheus-postgres-exporter.fullname" . }}
   namespace: {{ .Release.Namespace }}
 spec:
+  replicas: {{ .Values.deployment.replicas }}
   selector:
     matchLabels:
       {{- include "prometheus-postgres-exporter.pod.selectorLabels" . | nindent 6 }}
@@ -20,6 +21,10 @@ spec:
       labels:
         {{- include "prometheus-postgres-exporter.pod.labels" . | nindent 8 }}
     spec:
+      {{- with .Values.deployment.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: postgres-exporter
         args:

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,7 +25,7 @@ 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 service is not defined!" .Values.services.http.port }}
     {{- with .Values.prometheus.metrics.serviceMonitor.tlsConfig }}
     tlsConfig:

unittests/configMaps/grafanaDashboardPostgresExporter.yaml

@@ -0,0 +1,79 @@
+chart:
+  appVersion: 0.1.0
+  version: 0.1.0
+suite: ConfigMap template (Grafana Dashboard PostgresExporter)
+release:
+  name: prometheus-postgres-exporter-unittest
+  namespace: testing
+templates:
+- templates/prometheus-postgres-exporter/configMapGrafanaDashboardPostgresExporter.yaml
+tests:
+- it: Rendering postgresExporter
+  asserts:
+  - hasDocuments:
+      count: 0
+
+- it: Rendering
+  set:
+    grafana.enabled: true
+  asserts:
+  - hasDocuments:
+      count: 1
+  - containsDocument:
+      apiVersion: v1
+      kind: ConfigMap
+      name: prometheus-postgres-exporter-unittest-grafana-dashboard-postgres-exporter
+      namespace: testing
+  - notExists:
+      path: metadata.annotations
+  - equal:
+      path: metadata.labels
+      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
+        grafana_dashboard: "1"
+        helm.sh/chart: prometheus-postgres-exporter-0.1.0
+  - exists:
+      path: data["postgresExporter.json"]
+
+- it: Test custom annotations and labels
+  set:
+    grafana.enabled: true
+    grafana.dashboards.postgresExporter.annotations:
+      foo: bar
+    grafana.dashboards.postgresExporter.labels:
+      bar: foo
+  asserts:
+  - equal:
+      path: metadata.annotations
+      value:
+        foo: bar
+  - equal:
+      path: metadata.labels
+      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
+        grafana_dashboard: "1"
+        helm.sh/chart: prometheus-postgres-exporter-0.1.0
+        bar: foo
+
+- it: Test custom grafana discovery labels
+  set:
+    grafana.enabled: true
+    grafana.dashboardDiscoveryLabels:
+      grafana_dashboard: null
+      my-custom-discovery-label: my-value
+  asserts:
+  - equal:
+      path: metadata.labels
+      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
+        my-custom-discovery-label: my-value
+        helm.sh/chart: prometheus-postgres-exporter-0.1.0

unittests/deployment/deployment.yaml

@@ -27,6 +27,11 @@ tests:
         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.replicas
+      value: 1
+  - notExists:
+      path: spec.template.spec.affinity
   - contains:
       path: spec.template.spec.containers[0].envFrom
       content:
@@ -42,13 +47,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
@@ -91,6 +96,40 @@ tests:
   - notExists:
       path: spec.template.spec.topologySpreadConstraints
 
+- it: Test custom replicas
+  set:
+    deployment.replicas: 3
+  asserts:
+  - equal:
+      path: spec.replicas
+      value: 3
+
+- it: Test custom affinity
+  set:
+    deployment.affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: topology.kubernetes.io/zone
+              operator: In
+              values:
+              - antarctica-east1
+              - antarctica-west1
+  asserts:
+  - equal:
+      path: spec.template.spec.affinity
+      value:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: topology.kubernetes.io/zone
+                operator: In
+                values:
+                - antarctica-east1
+                - antarctica-west1
+
 - it: Test additional arguments
   set:
     deployment.postgresExporter.args:
@@ -143,13 +182,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 +204,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 +391,24 @@ tests:
       hostPath:
         path: /usr/lib/prometheus-postgres-exporter/data
   asserts:
-  - contains:
+  - equal:
       path: spec.template.spec.containers[0].volumeMounts
-      content:
-        name: data
+      value:
+      - 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:
-        name: data
+      value:
+      - name: data
         hostPath:
-          path: /usr/lib/prometheus-postgres-exporter/data
+          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
@@ -119,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"
@@ -137,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"
@@ -139,7 +139,7 @@ tests:
       count: 1
   - equal:
       path: spec.endpoints[0].enableHttp2
-      value: true
+      value: false
   - equal:
       path: spec.endpoints[0].followRedirects
       value: true

values.schema.json

@@ -0,0 +1,700 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "nameOverride": {
+      "type": "string"
+    },
+    "fullnameOverride": {
+      "type": "string"
+    },
+    "config": {
+      "type": "object",
+      "properties": {
+        "database": {
+          "type": "object",
+          "properties": {
+            "existingSecret": {
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "type": "boolean"
+                },
+                "secretName": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "enabled",
+                "secretName"
+              ]
+            },
+            "secret": {
+              "type": "object",
+              "properties": {
+                "annotations": {
+                  "type": "object"
+                },
+                "labels": {
+                  "type": "object"
+                },
+                "databaseUsername": {
+                  "type": "string"
+                },
+                "databasePassword": {
+                  "type": "string"
+                },
+                "databaseConnectionUrl": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "annotations",
+                "labels",
+                "databaseUsername",
+                "databasePassword",
+                "databaseConnectionUrl"
+              ]
+            }
+          },
+          "required": [
+            "existingSecret",
+            "secret"
+          ]
+        },
+        "exporterConfig": {
+          "type": "object",
+          "properties": {
+            "existingSecret": {
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "type": "boolean"
+                },
+                "secretName": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "enabled",
+                "secretName"
+              ]
+            },
+            "secret": {
+              "type": "object",
+              "properties": {
+                "annotations": {
+                  "type": "object"
+                },
+                "labels": {
+                  "type": "object"
+                },
+                "exporterConfig": {
+                  "type": "object"
+                }
+              },
+              "required": [
+                "annotations",
+                "labels",
+                "exporterConfig"
+              ]
+            }
+          },
+          "required": [
+            "existingSecret",
+            "secret"
+          ]
+        },
+        "webConfig": {
+          "type": "object",
+          "properties": {
+            "existingSecret": {
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "type": "boolean"
+                },
+                "secretName": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "enabled",
+                "secretName"
+              ]
+            },
+            "secret": {
+              "type": "object",
+              "properties": {
+                "annotations": {
+                  "type": "object"
+                },
+                "labels": {
+                  "type": "object"
+                },
+                "webConfig": {
+                  "type": "object"
+                }
+              },
+              "required": [
+                "annotations",
+                "labels",
+                "webConfig"
+              ]
+            }
+          },
+          "required": [
+            "existingSecret",
+            "secret"
+          ]
+        }
+      },
+      "required": [
+        "database",
+        "exporterConfig",
+        "webConfig"
+      ]
+    },
+    "deployment": {
+      "type": "object",
+      "properties": {
+        "annotations": {
+          "type": "object"
+        },
+        "labels": {
+          "type": "object"
+        },
+        "additionalContainers": {
+          "type": "array",
+          "items": {}
+        },
+        "affinity": {
+          "type": "object"
+        },
+        "initContainers": {
+          "type": "array",
+          "items": {}
+        },
+        "dnsConfig": {
+          "type": "object"
+        },
+        "dnsPolicy": {
+          "type": "string"
+        },
+        "hostname": {
+          "type": "string"
+        },
+        "subdomain": {
+          "type": "string"
+        },
+        "hostNetwork": {
+          "type": "boolean"
+        },
+        "imagePullSecrets": {
+          "type": "array",
+          "items": {}
+        },
+        "postgresExporter": {
+          "type": "object",
+          "properties": {
+            "args": {
+              "type": "array",
+              "items": {}
+            },
+            "env": {
+              "type": "array",
+              "items": {}
+            },
+            "envFrom": {
+              "type": "array",
+              "items": {}
+            },
+            "image": {
+              "type": "object",
+              "properties": {
+                "registry": {
+                  "type": "string"
+                },
+                "repository": {
+                  "type": "string"
+                },
+                "tag": {
+                  "type": "string"
+                },
+                "pullPolicy": {
+                  "type": "string"
+                }
+              },
+              "required": [
+                "registry",
+                "repository",
+                "tag",
+                "pullPolicy"
+              ]
+            },
+            "resources": {
+              "type": "object"
+            },
+            "securityContext": {
+              "type": "object"
+            },
+            "volumeMounts": {
+              "type": "array",
+              "items": {}
+            }
+          },
+          "required": [
+            "args",
+            "env",
+            "envFrom",
+            "image",
+            "resources",
+            "securityContext",
+            "volumeMounts"
+          ]
+        },
+        "nodeSelector": {
+          "type": "object"
+        },
+        "priorityClassName": {
+          "type": "string"
+        },
+        "replicas": {
+          "type": "integer"
+        },
+        "restartPolicy": {
+          "type": "string"
+        },
+        "securityContext": {
+          "type": "object"
+        },
+        "strategy": {
+          "type": "object",
+          "properties": {
+            "type": {
+              "type": "string"
+            },
+            "rollingUpdate": {
+              "type": "object",
+              "properties": {
+                "maxSurge": {
+                  "type": "integer"
+                },
+                "maxUnavailable": {
+                  "type": "integer"
+                }
+              },
+              "required": [
+                "maxSurge",
+                "maxUnavailable"
+              ]
+            }
+          },
+          "required": [
+            "type",
+            "rollingUpdate"
+          ]
+        },
+        "terminationGracePeriodSeconds": {
+          "type": "integer"
+        },
+        "tolerations": {
+          "type": "array",
+          "items": {}
+        },
+        "topologySpreadConstraints": {
+          "type": "array",
+          "items": {}
+        },
+        "volumes": {
+          "type": "array",
+          "items": {}
+        }
+      },
+      "required": [
+        "annotations",
+        "labels",
+        "additionalContainers",
+        "affinity",
+        "initContainers",
+        "dnsConfig",
+        "dnsPolicy",
+        "hostname",
+        "subdomain",
+        "hostNetwork",
+        "imagePullSecrets",
+        "postgresExporter",
+        "nodeSelector",
+        "priorityClassName",
+        "replicas",
+        "restartPolicy",
+        "securityContext",
+        "strategy",
+        "terminationGracePeriodSeconds",
+        "tolerations",
+        "topologySpreadConstraints",
+        "volumes"
+      ]
+    },
+    "grafana": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        },
+        "dashboardDiscoveryLabels": {
+          "type": "object"
+        },
+        "dashboards": {
+          "type": "object",
+          "properties": {
+            "postgresExporter": {
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "type": "boolean"
+                },
+                "annotations": {
+                  "type": "object"
+                },
+                "labels": {
+                  "type": "object"
+                }
+              },
+              "required": [
+                "enabled",
+                "annotations",
+                "labels"
+              ]
+            }
+          },
+          "required": [
+            "postgresExporter"
+          ]
+        }
+      },
+      "required": [
+        "enabled",
+        "dashboardDiscoveryLabels",
+        "dashboards"
+      ]
+    },
+    "ingress": {
+      "type": "object",
+      "properties": {
+        "enabled": {
+          "type": "boolean"
+        },
+        "className": {
+          "type": "string"
+        },
+        "annotations": {
+          "type": "object"
+        },
+        "labels": {
+          "type": "object"
+        },
+        "hosts": {
+          "type": "array",
+          "items": {}
+        },
+        "tls": {
+          "type": "array",
+          "items": {}
+        }
+      },
+      "required": [
+        "enabled",
+        "className",
+        "annotations",
+        "labels",
+        "hosts",
+        "tls"
+      ]
+    },
+    "podDisruptionBudget": {
+      "type": "object"
+    },
+    "networkPolicies": {
+      "type": "object"
+    },
+    "prometheus": {
+      "type": "object",
+      "properties": {
+        "metrics": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "podMonitor": {
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "type": "boolean"
+                },
+                "annotations": {
+                  "type": "object"
+                },
+                "enableHttp2": {
+                  "type": "boolean"
+                },
+                "followRedirects": {
+                  "type": "boolean"
+                },
+                "honorLabels": {
+                  "type": "boolean"
+                },
+                "labels": {
+                  "type": "object"
+                },
+                "interval": {
+                  "type": "string"
+                },
+                "path": {
+                  "type": "string"
+                },
+                "relabelings": {
+                  "type": "array",
+                  "items": {}
+                },
+                "scrapeTimeout": {
+                  "type": "string"
+                },
+                "scheme": {
+                  "type": "string"
+                },
+                "tlsConfig": {
+                  "type": "object"
+                }
+              },
+              "required": [
+                "enabled",
+                "annotations",
+                "enableHttp2",
+                "followRedirects",
+                "honorLabels",
+                "labels",
+                "interval",
+                "path",
+                "relabelings",
+                "scrapeTimeout",
+                "scheme",
+                "tlsConfig"
+              ]
+            },
+            "serviceMonitor": {
+              "type": "object",
+              "properties": {
+                "enabled": {
+                  "type": "boolean"
+                },
+                "annotations": {
+                  "type": "object"
+                },
+                "labels": {
+                  "type": "object"
+                },
+                "enableHttp2": {
+                  "type": "boolean"
+                },
+                "followRedirects": {
+                  "type": "boolean"
+                },
+                "honorLabels": {
+                  "type": "boolean"
+                },
+                "interval": {
+                  "type": "string"
+                },
+                "path": {
+                  "type": "string"
+                },
+                "relabelings": {
+                  "type": "array",
+                  "items": {}
+                },
+                "scrapeTimeout": {
+                  "type": "string"
+                },
+                "scheme": {
+                  "type": "string"
+                },
+                "tlsConfig": {
+                  "type": "object"
+                }
+              },
+              "required": [
+                "enabled",
+                "annotations",
+                "labels",
+                "enableHttp2",
+                "followRedirects",
+                "honorLabels",
+                "interval",
+                "path",
+                "relabelings",
+                "scrapeTimeout",
+                "scheme",
+                "tlsConfig"
+              ]
+            }
+          },
+          "required": [
+            "enabled",
+            "podMonitor",
+            "serviceMonitor"
+          ]
+        },
+        "rules": {
+          "type": "array",
+          "items": {}
+        }
+      },
+      "required": [
+        "metrics",
+        "rules"
+      ]
+    },
+    "services": {
+      "type": "object",
+      "properties": {
+        "http": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "annotations": {
+              "type": "object"
+            },
+            "externalIPs": {
+              "type": "array",
+              "items": {}
+            },
+            "externalTrafficPolicy": {
+              "type": "string"
+            },
+            "internalTrafficPolicy": {
+              "type": "string"
+            },
+            "ipFamilies": {
+              "type": "array",
+              "items": {}
+            },
+            "labels": {
+              "type": "object"
+            },
+            "loadBalancerClass": {
+              "type": "string"
+            },
+            "loadBalancerIP": {
+              "type": "string"
+            },
+            "loadBalancerSourceRanges": {
+              "type": "array",
+              "items": {}
+            },
+            "port": {
+              "type": "integer"
+            },
+            "sessionAffinity": {
+              "type": "string"
+            },
+            "sessionAffinityConfig": {
+              "type": "object"
+            },
+            "type": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "enabled",
+            "annotations",
+            "externalIPs",
+            "externalTrafficPolicy",
+            "internalTrafficPolicy",
+            "ipFamilies",
+            "labels",
+            "loadBalancerClass",
+            "loadBalancerIP",
+            "loadBalancerSourceRanges",
+            "port",
+            "sessionAffinity",
+            "sessionAffinityConfig",
+            "type"
+          ]
+        }
+      },
+      "required": [
+        "http"
+      ]
+    },
+    "serviceAccount": {
+      "type": "object",
+      "properties": {
+        "existing": {
+          "type": "object",
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            },
+            "serviceAccountName": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "enabled",
+            "serviceAccountName"
+          ]
+        },
+        "new": {
+          "type": "object",
+          "properties": {
+            "annotations": {
+              "type": "object"
+            },
+            "labels": {
+              "type": "object"
+            },
+            "automountServiceAccountToken": {
+              "type": "boolean"
+            },
+            "imagePullSecrets": {
+              "type": "array",
+              "items": {}
+            },
+            "secrets": {
+              "type": "array",
+              "items": {}
+            }
+          },
+          "required": [
+            "annotations",
+            "labels",
+            "automountServiceAccountToken",
+            "imagePullSecrets",
+            "secrets"
+          ]
+        }
+      },
+      "required": [
+        "existing",
+        "new"
+      ]
+    }
+  },
+  "required": [
+    "nameOverride",
+    "fullnameOverride",
+    "config",
+    "deployment",
+    "grafana",
+    "ingress",
+    "podDisruptionBudget",
+    "networkPolicies",
+    "prometheus",
+    "services",
+    "serviceAccount"
+  ]
+}

values.yaml

@@ -1,6 +1,3 @@
-# Default values for qu-seed.
-# This is a YAML-formatted file.
-
 # Declare variables to be passed into your templates.
 ## @section Global
 ## @param nameOverride Individual release name suffix.
@@ -38,7 +35,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: {}
@@ -84,7 +81,7 @@ config:
 ## @section Deployment
 deployment:
   ## @param deployment.annotations Additional deployment annotations.
-  ## @param deployment.labels Additional ingress labels.
+  ## @param deployment.labels Additional deployment labels.
   annotations: {}
   labels: {}
 
@@ -201,8 +198,8 @@ deployment:
   ## @param deployment.priorityClassName PriorityClassName of the postgres-exporter deployment.
   priorityClassName: ""
 
-  ## @param deployment.replicaCount Number of replicas for the postgres-exporter deployment.
-  replicaCount: 1
+  ## @param deployment.replicas Number of replicas for the postgres-exporter deployment.
+  replicas: 1
 
   ## @param deployment.restartPolicy Restart policy of the postgres-exporter deployment.
   restartPolicy: ""
@@ -248,12 +245,23 @@ deployment:
   #     secretName: my-secret
 
 ## @section Grafana
-## @param grafana.enabled Enable integration into Grafana.
-## @param grafana.dashboards.businessMetrics Enable deployment of Grafana dashboard `businessMetrics`.
+## @param grafana.enabled Enable integration into Grafana. Require the Prometheus operator deployment.
 grafana:
   enabled: false
+
+  ## @param grafana.dashboardDiscoveryLabels Labels that Grafana uses to discover resources. The labels may vary depending on the Grafana deployment.
+  ## @skip grafana.dashboardDiscoveryLabels
+  dashboardDiscoveryLabels:
+    grafana_dashboard: "1"
+
   dashboards:
-    businessMetrics: true
+    ## @param grafana.dashboards.postgresExporter.enabled Enable deployment of Grafana dashboard `postgresExporter`.
+    ## @param grafana.dashboards.postgresExporter.annotations Additional configmap annotations.
+    ## @param grafana.dashboards.postgresExporter.labels Additional configmap labels.
+    postgresExporter:
+      enabled: true
+      annotations: {}
+      labels: {}
 
 ## @section Ingress
 ingress:
@@ -304,7 +312,7 @@ prometheus:
     ## @param prometheus.metrics.podMonitor.honorLabels Honor labels.
     ## @param prometheus.metrics.podMonitor.labels Additional podMonitor labels.
     ## @param prometheus.metrics.podMonitor.interval Interval at which metrics should be scraped. If not specified Prometheus' global scrape interval is used.
-    ## @param prometheus.metrics.podMonitor.path HTTP path for scraping prometheus metrics.
+    ## @param prometheus.metrics.podMonitor.path HTTP path for scraping Prometheus metrics.
     ## @param prometheus.metrics.podMonitor.relabelings RelabelConfigs to apply to samples before scraping. Prometheus Operator automatically adds relabelings for a few standard Kubernetes fields.
     ## @param prometheus.metrics.podMonitor.scrapeTimeout Timeout after which the scrape is ended. If not specified, global Prometheus scrape timeout is used.
     ## @param prometheus.metrics.podMonitor.scheme HTTP scheme to use for scraping. For example `http` or `https`.
@@ -313,7 +321,7 @@ prometheus:
     podMonitor:
       enabled: false
       annotations: {}
-      enableHttp2: false
+      enableHttp2: true
       followRedirects: false
       honorLabels: false
       labels: {}
@@ -331,7 +339,7 @@ prometheus:
     ## @param prometheus.metrics.serviceMonitor.followRedirects FollowRedirects configures whether scrape requests follow HTTP 3xx redirects.
     ## @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.path HTTP path 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`.
@@ -341,7 +349,7 @@ prometheus:
       enabled: false
       annotations: {}
       labels: {}
-      enableHttp2: false
+      enableHttp2: true
       followRedirects: false
       honorLabels: false
       interval: "60s"
@@ -351,8 +359,8 @@ prometheus:
       scheme: "http"
       tlsConfig: {}
 
-  ## @param prometheus.rules Array of prometheus rules for monitoring the application and triggering alerts.
-  ## @skip prometheus.rules Skip individual prometheus rules.
+  ## @param prometheus.rules Array of Prometheus rules for monitoring the application and triggering alerts.
+  ## @skip prometheus.rules Skip individual Prometheus rules.
   rules: []
   # - alert: ExporterErrors
   #   expr: pg_exporter_last_scrape_error == 1