From e1d5d128c0b1242db15f0fa057e406dff5670461 Mon Sep 17 00:00:00 2001 From: Keith Fiske Date: Fri, 1 Nov 2024 13:44:26 -0400 Subject: [PATCH] fix: update etcd grafana dashboard for etcd 3.5 --- changelogs/fragments/425.yml | 1 + changelogs/fragments/441.yml | 3 +++ grafana/common/ETCD_Details.json | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/441.yml diff --git a/changelogs/fragments/425.yml b/changelogs/fragments/425.yml index 083d7f6..5d87a60 100644 --- a/changelogs/fragments/425.yml +++ b/changelogs/fragments/425.yml @@ -1,3 +1,4 @@ +--- breaking_changes: - grafana - Update the dashboards to support Grafana 10.4 so that we're on an officially supported version of Grafana. This does potentially break backward compatibility with Grafana 9.x, so an update to Grafana 10.4 will be required with this version of pgMonitor. bugfixes: diff --git a/changelogs/fragments/441.yml b/changelogs/fragments/441.yml new file mode 100644 index 0000000..ee4afdf --- /dev/null +++ b/changelogs/fragments/441.yml @@ -0,0 +1,3 @@ +--- +bugfixes: + - grafana - Fix etcd dashboard to use new metric names in etcd 3.5 diff --git a/grafana/common/ETCD_Details.json b/grafana/common/ETCD_Details.json index 5bec8f6..7f990e6 100644 --- a/grafana/common/ETCD_Details.json +++ b/grafana/common/ETCD_Details.json @@ -1589,7 +1589,7 @@ "type": "prometheus", "uid": "PDC1078F23EBDF0E5" }, - "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", @@ -1600,7 +1600,7 @@ "type": "prometheus", "uid": "PDC1078F23EBDF0E5" }, - "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",