Merge branch 'development' into autovac_running

CrunchyData · Aug 5, 2024 · fa43c91 · fa43c91
2 parents 97d0f29 + c828ce7
commit fa43c91
Show file tree

Hide file tree

Showing 9 changed files with 14,563 additions and 3 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/404.yml b/changelogs/fragments/404.yml
@@ -0,0 +1,4 @@
+bugfixes:
+  - grafana - Fix etcd dashboard to use new metric names in etcd 3.5
+
+
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/grafana/etcd/ETCD_Details.json b/grafana/etcd/ETCD_Details.json
@@ -1588,7 +1588,7 @@
             "type": "prometheus",
             "uid": "${ccp_datasource}"
           },
-          "expr": "rate(etcd_debugging_mvcc_put_total{exp_type=\"etcd\",job=~\"$job\"}[5m])",
+          "expr": "rate(etcd_mvcc_put_total{exp_type=\"etcd\",job=~\"$job\"}[5m])",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{ job }} puts/s",
@@ -1599,7 +1599,7 @@
             "type": "prometheus",
             "uid": "${ccp_datasource}"
           },
-          "expr": "rate(etcd_debugging_mvcc_delete_total{exp_type=\"etcd\",job=~\"$job\"}[5m])",
+          "expr": "rate(etcd_mvcc_delete_total{exp_type=\"etcd\",job=~\"$job\"}[5m])",
           "format": "time_series",
           "intervalFactor": 1,
           "legendFormat": "{{ job }} deletes/s",