chore: merge upstream dev

CrunchyData · Jul 31, 2024 · b4b28ee · b4b28ee
2 parents 6e5112a + 7b29f5f
commit b4b28ee
Show file tree

Hide file tree

Showing 30 changed files with 15,280 additions and 392 deletions.
diff --git a/build/packages.yml b/build/packages.yml
@@ -178,6 +178,13 @@ packages:
           - { pkg_name: "pgmonitor-grafana-extras-common" }
         upstream_repo: "https://github.com/CrunchyData/pgmonitor"
 
+    - pgmonitor-grafana-extras-haproxy:
+        files:
+          - { source: "grafana/haproxy/HAProxy.json", target: "/etc/grafana/crunchy_dashboards/", mode: "0640", type: "file", rpm_new: false, owner: "grafana", group: "grafana" }
+        pkg_dependency:
+          - { pkg_name: "pgmonitor-grafana-extras-common" }
+        upstream_repo: "https://github.com/CrunchyData/pgmonitor"
+
     - pgmonitor-grafana-extras-pg-postgres-exporter:
         files:
           - { source: "grafana/postgres/postgres_exporter/PG_Overview_postgres_exporter.json", target: "/etc/grafana/crunchy_dashboards/", mode: "0640", type: "file", rpm_new: false, owner: "grafana", group: "grafana" }
@@ -213,7 +220,6 @@ packages:
           - { pkg_name: "pgmonitor-grafana-extras-common" }
         upstream_repo: "https://github.com/CrunchyData/pgmonitor"
 
-
     - pg-bloat-check:
         files:
           - { source: "pg_bloat_check.py", target: "/usr/bin/pg_bloat_check.py", mode: "0755", type: "file", rpm_new: false, owner: "root", group: "root" }

diff --git a/changelogs/fragments/207.yml b/changelogs/fragments/207.yml
@@ -0,0 +1,4 @@
+minor_changes:
+  - grafana - add a dashboard for HAProxy
+
+
diff --git a/changelogs/fragments/408.yml b/changelogs/fragments/408.yml
@@ -0,0 +1,2 @@
+trivial:
+  - docs -  Add section for suggested additional metrics
diff --git a/changelogs/fragments/410.yml b/changelogs/fragments/410.yml
@@ -0,0 +1,3 @@
+minor_changes:
+  - grafana - Add a new variable dropdown to all dashboards for the Datasource. Allows more flexiblity when importing the dashboard to different environments.
+
diff --git a/changelogs/fragments/418.yml b/changelogs/fragments/418.yml
@@ -0,0 +1,3 @@
+trivial:
+  - grafana - Update Grafana package/dashboard listing
+  - postgres_exporter - Add warning about uninstalling postgres_exporter packages with DNF
diff --git a/changelogs/fragments/419.yml b/changelogs/fragments/419.yml
@@ -0,0 +1,2 @@
+trivial:
+  - sql_exporter - Clarify usage of pgmonitor-extension
diff --git a/changelogs/fragments/420.yml b/changelogs/fragments/420.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - postgres_exporter - Fix query for pgBackRest monitoring to handle 3 number versions