From 4f6874057f307ebdd6f5812463d1a0a1aa3e688b Mon Sep 17 00:00:00 2001
From: WrenIX <dev@wrenix.eu>
Date: Fri, 11 Apr 2025 13:31:48 +0200
Subject: [PATCH] fix(postgresql): improve monitoring

---
 postgresql/Chart.yaml                                | 2 +-
 postgresql/README.md                                 | 2 +-
 postgresql/grafana_dashboards/postgres-overview.json | 2 +-
 postgresql/templates/prometheus-rules.yaml           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/postgresql/Chart.yaml b/postgresql/Chart.yaml
index 902a80a..20c38aa 100644
--- a/postgresql/Chart.yaml
+++ b/postgresql/Chart.yaml
@@ -4,7 +4,7 @@ name: "postgresql"
 description: "A Helm chart for running PostgreSQL (Postgres) database"
 icon: https://wiki.postgresql.org/images/a/a4/PostgreSQL_logo.3colors.svg
 type: "application"
-version: "0.3.1"
+version: "0.3.3"
 # renovate: image=docker.io/library/postgres
 appVersion: "17.4-alpine"
 maintainers:
diff --git a/postgresql/README.md b/postgresql/README.md
index 8b7a4fd..2021dd4 100644
--- a/postgresql/README.md
+++ b/postgresql/README.md
@@ -7,7 +7,7 @@ description: "A Helm chart for running PostgreSQL (Postgres) database"
 
 # postgresql
 
-![Version: 0.3.1](https://img.shields.io/badge/Version-0.3.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 17.4-alpine](https://img.shields.io/badge/AppVersion-17.4--alpine-informational?style=flat-square)
+![Version: 0.3.3](https://img.shields.io/badge/Version-0.3.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 17.4-alpine](https://img.shields.io/badge/AppVersion-17.4--alpine-informational?style=flat-square)
 
 A Helm chart for running PostgreSQL (Postgres) database
 
diff --git a/postgresql/grafana_dashboards/postgres-overview.json b/postgresql/grafana_dashboards/postgres-overview.json
index 7360ed2..8e3ab8e 100644
--- a/postgresql/grafana_dashboards/postgres-overview.json
+++ b/postgresql/grafana_dashboards/postgres-overview.json
@@ -1213,7 +1213,7 @@
           "value": "$__all"
         },
         "datasource": "$datasource",
-        "definition": "label_values(up{namespace=~\"$namespace\"},service)",
+        "definition": "label_values(pg_up{namespace=~\"$namespace\"},service)",
         "description": "",
         "includeAll": true,
         "label": "Service",
diff --git a/postgresql/templates/prometheus-rules.yaml b/postgresql/templates/prometheus-rules.yaml
index 3e570f4..51d79ab 100644
--- a/postgresql/templates/prometheus-rules.yaml
+++ b/postgresql/templates/prometheus-rules.yaml
@@ -1,6 +1,6 @@
 {{- if and .Values.prometheus.rules.enabled }}
 {{- $fullname := include "postgresql.fullname" . }}
-{{- $filter := printf `namespace="%s",service=~"%s.*"` .Release.Namespace $fullname }}
+{{- $filter := printf `namespace="%s",job="%s"` .Release.Namespace $fullname }}
 ---
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule