From 778be2ecd4cc90bc54456ebc3bcd39f105db6d78 Mon Sep 17 00:00:00 2001 From: Mikhail Grigorev Date: Wed, 15 Jan 2025 14:09:48 +0500 Subject: [PATCH 1/2] Update Grafana dashboards --- deploy/grafana/pgSCV_Patroni.json | 4 ++-- deploy/grafana/pgSCV_Pgbouncer.json | 4 ++-- deploy/grafana/pgSCV_PostgreSQL.json | 4 ++-- deploy/grafana/pgSCV_System.json | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deploy/grafana/pgSCV_Patroni.json b/deploy/grafana/pgSCV_Patroni.json index 6e7fe487..0c65cb76 100644 --- a/deploy/grafana/pgSCV_Patroni.json +++ b/deploy/grafana/pgSCV_Patroni.json @@ -52,7 +52,7 @@ } ] }, - "description": "Patroni dashboard for pgSCV metrics (Prometheus version, pgSCV 0.8.4 edition)", + "description": "Patroni dashboard for pgSCV metrics (Prometheus version, pgSCV 0.9.7 edition)", "editable": true, "fiscalYearStartMonth": 0, "gnetId": 21429, @@ -2571,6 +2571,6 @@ "timezone": "", "title": "pgSCV: Patroni", "uid": "aim7Ue3th", - "version": 21, + "version": 22, "weekStart": "" } \ No newline at end of file diff --git a/deploy/grafana/pgSCV_Pgbouncer.json b/deploy/grafana/pgSCV_Pgbouncer.json index 28a2d5d5..afc5f16d 100644 --- a/deploy/grafana/pgSCV_Pgbouncer.json +++ b/deploy/grafana/pgSCV_Pgbouncer.json @@ -58,7 +58,7 @@ } ] }, - "description": "Pgbouncer dashboard for pgSCV metrics (Prometheus version, pgSCV 0.8.4 edition)", + "description": "Pgbouncer dashboard for pgSCV metrics (Prometheus version, pgSCV 0.9.7 edition)", "editable": true, "fiscalYearStartMonth": 0, "gnetId": 14541, @@ -1860,6 +1860,6 @@ "timezone": "", "title": "pgSCV: Pgbouncer", "uid": "yA3wjF6Mk", - "version": 21, + "version": 22, "weekStart": "" } \ No newline at end of file diff --git a/deploy/grafana/pgSCV_PostgreSQL.json b/deploy/grafana/pgSCV_PostgreSQL.json index ec9aefb8..495ef004 100644 --- a/deploy/grafana/pgSCV_PostgreSQL.json +++ b/deploy/grafana/pgSCV_PostgreSQL.json @@ -58,7 +58,7 @@ } ] }, - "description": "PostgreSQL dashboard for pgSCV metrics (Prometheus version, pgSCV 0.9.2 edition)", + "description": "PostgreSQL dashboard for pgSCV metrics (Prometheus version, pgSCV 0.9.7 edition)", "editable": true, "fiscalYearStartMonth": 0, "gnetId": 21430, @@ -6771,6 +6771,6 @@ "timezone": "", "title": "pgSCV: PostgreSQL", "uid": "N6PwjKeGz", - "version": 30, + "version": 31, "weekStart": "" } \ No newline at end of file diff --git a/deploy/grafana/pgSCV_System.json b/deploy/grafana/pgSCV_System.json index 2752fc88..c08af81a 100644 --- a/deploy/grafana/pgSCV_System.json +++ b/deploy/grafana/pgSCV_System.json @@ -58,7 +58,7 @@ } ] }, - "description": "System dashboard for pgSCV metrics (Prometheus version, pgSCV 0.8.4 edition)", + "description": "System dashboard for pgSCV metrics (Prometheus version, pgSCV 0.9.7 edition)", "editable": true, "fiscalYearStartMonth": 0, "gnetId": 14539, @@ -1275,7 +1275,7 @@ "uid": "${DS_VICTORIAMETRICS-PGSCV}" }, "exemplar": true, - "expr": "rate(node_vmstat_pswpin{}[1m])*4096", + "expr": "rate(node_vmstat_pswpin{instance=\"$instance\"}[1m])*4096", "interval": "", "legendFormat": "in", "refId": "A" @@ -1286,7 +1286,7 @@ "uid": "${ds}" }, "exemplar": true, - "expr": "rate(node_vmstat_pswpout{}[1m])*4096", + "expr": "rate(node_vmstat_pswpout{instance=\"$instance\"}[1m])*4096", "hide": false, "interval": "", "legendFormat": "out", @@ -2886,6 +2886,6 @@ "timezone": "", "title": "pgSCV: System", "uid": "SA2wCKeGz", - "version": 16, + "version": 17, "weekStart": "" } \ No newline at end of file From b9d5ac4952350fee8c7918a6229357840b6bd971 Mon Sep 17 00:00:00 2001 From: Mikhail Grigorev Date: Wed, 15 Jan 2025 14:11:57 +0500 Subject: [PATCH 2/2] Update Grafana dashboards for demo-lab --- .../provisioning/dashboards/default/pgSCV_Patroni.json | 2 +- .../provisioning/dashboards/default/pgSCV_Pgbouncer.json | 2 +- .../provisioning/dashboards/default/pgSCV_PostgreSQL.json | 2 +- .../provisioning/dashboards/default/pgSCV_System.json | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_Patroni.json b/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_Patroni.json index 43f90a41..e6ba1a2b 100644 --- a/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_Patroni.json +++ b/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_Patroni.json @@ -15,7 +15,7 @@ } ] }, - "description": "Patroni dashboard for pgSCV metrics (Prometheus version, pgSCV 0.8.4 edition)", + "description": "Patroni dashboard for pgSCV metrics (Prometheus version, pgSCV 0.9.7 edition)", "editable": true, "fiscalYearStartMonth": 0, "gnetId": 21462, diff --git a/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_Pgbouncer.json b/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_Pgbouncer.json index 5795e9c7..ed6c39e2 100644 --- a/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_Pgbouncer.json +++ b/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_Pgbouncer.json @@ -15,7 +15,7 @@ } ] }, - "description": "Pgbouncer dashboard for pgSCV metrics (Prometheus version, pgSCV 0.8.4 edition)", + "description": "Pgbouncer dashboard for pgSCV metrics (Prometheus version, pgSCV 0.9.7 edition)", "editable": true, "fiscalYearStartMonth": 0, "gnetId": 21429, diff --git a/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_PostgreSQL.json b/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_PostgreSQL.json index d90edbd9..471ca4f9 100644 --- a/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_PostgreSQL.json +++ b/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_PostgreSQL.json @@ -15,7 +15,7 @@ } ] }, - "description": "PostgreSQL dashboard for pgSCV metrics (Prometheus version, pgSCV 0.9.2 edition)", + "description": "PostgreSQL dashboard for pgSCV metrics (Prometheus version, pgSCV 0.9.7 edition)", "editable": true, "fiscalYearStartMonth": 0, "gnetId": 21430, diff --git a/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_System.json b/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_System.json index e09ac898..1f5de553 100644 --- a/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_System.json +++ b/deploy/demo-lab/grafana/provisioning/dashboards/default/pgSCV_System.json @@ -15,7 +15,7 @@ } ] }, - "description": "System dashboard for pgSCV metrics (Prometheus version, pgSCV 0.8.4 edition)", + "description": "System dashboard for pgSCV metrics (Prometheus version, pgSCV 0.9.7 edition)", "editable": true, "fiscalYearStartMonth": 0, "gnetId": 21409, @@ -1232,7 +1232,7 @@ "uid": "DS_VM_01" }, "exemplar": true, - "expr": "rate(node_vmstat_pswpin{}[1m])*4096", + "expr": "rate(node_vmstat_pswpin{instance=\"$instance\"}[1m])*4096", "interval": "", "legendFormat": "in", "refId": "A" @@ -1243,7 +1243,7 @@ "uid": "${ds}" }, "exemplar": true, - "expr": "rate(node_vmstat_pswpout{}[1m])*4096", + "expr": "rate(node_vmstat_pswpout{instance=\"$instance\"}[1m])*4096", "hide": false, "interval": "", "legendFormat": "out",