From bbdeae792e11a31b8fe9698020a9e14f7f0a1cf3 Mon Sep 17 00:00:00 2001 From: Matej Kubinec Date: Wed, 17 Jun 2026 11:20:02 +0200 Subject: [PATCH] PMM-14895 Replace usage of Master with Primary in Valkey dashboards --- Makefile.devcontainer | 5 +++++ dashboards/dashboards/Valkey/Valkey_ClusterDetails.json | 2 +- dashboards/dashboards/Valkey/Valkey_PersistenceDetails.json | 6 +++--- dashboards/dashboards/Valkey/Valkey_Replication.json | 2 +- .../dashboards/dashboard-valkey-redis-cluster-details.md | 2 +- .../dashboards/dashboard-valkey-redis-replication.md | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Makefile.devcontainer b/Makefile.devcontainer index f059e92a857..43115a8fc2b 100644 --- a/Makefile.devcontainer +++ b/Makefile.devcontainer @@ -61,6 +61,11 @@ run-all: run-agent-ci run-managed-ci run-qan-ci run-vmproxy-ci ## Run all go ser run: run-all ## Aliased to "run-all" echo "run is aliased to run-all" +reload-dashboards: + rm -r /usr/share/percona-dashboards/panels/pmm-app/dist/dashboards + cp -r /root/go/src/github.com/percona/pmm/dashboards/dashboards /usr/share/percona-dashboards/panels/pmm-app/dist/dashboards + supervisorctl restart grafana + # TODO https://jira.percona.com/browse/PMM-3484, see maincover_test.go # run-race-cover: install-race ## Run pmm-managed with race detector and collect coverage information. # go test -coverpkg="github.com/percona/pmm/managed/..." \ diff --git a/dashboards/dashboards/Valkey/Valkey_ClusterDetails.json b/dashboards/dashboards/Valkey/Valkey_ClusterDetails.json index c12a789a097..8639d6bce7a 100644 --- a/dashboards/dashboards/Valkey/Valkey_ClusterDetails.json +++ b/dashboards/dashboards/Valkey/Valkey_ClusterDetails.json @@ -790,7 +790,7 @@ "refId": "M" } ], - "title": "$service_name - Replica vs Master offsets", + "title": "$service_name - Replica vs Primary offsets", "type": "timeseries" }, { diff --git a/dashboards/dashboards/Valkey/Valkey_PersistenceDetails.json b/dashboards/dashboards/Valkey/Valkey_PersistenceDetails.json index 1da110c9d9e..9f0864775fe 100644 --- a/dashboards/dashboards/Valkey/Valkey_PersistenceDetails.json +++ b/dashboards/dashboards/Valkey/Valkey_PersistenceDetails.json @@ -38,7 +38,7 @@ }, "id": 60, "panels": [], - "title": "Master AOF Persistence ", + "title": "Primary AOF Persistence ", "type": "row" }, { @@ -785,7 +785,7 @@ "properties": [ { "id": "displayName", - "value": "Master offset" + "value": "Primary offset" } ] }, @@ -871,7 +871,7 @@ }, "id": 75, "panels": [], - "title": "Master RDB persistence", + "title": "Primary RDB persistence", "type": "row" }, { diff --git a/dashboards/dashboards/Valkey/Valkey_Replication.json b/dashboards/dashboards/Valkey/Valkey_Replication.json index 6b052b543d7..7394fbd1198 100644 --- a/dashboards/dashboards/Valkey/Valkey_Replication.json +++ b/dashboards/dashboards/Valkey/Valkey_Replication.json @@ -295,7 +295,7 @@ "useBackend": false } ], - "title": "$service_name - Replica vs Master Offsets", + "title": "$service_name - Replica vs Primary offsets", "type": "timeseries" }, { diff --git a/documentation/docs/reference/dashboards/dashboard-valkey-redis-cluster-details.md b/documentation/docs/reference/dashboards/dashboard-valkey-redis-cluster-details.md index 690c0669605..ed36c8c73a5 100644 --- a/documentation/docs/reference/dashboards/dashboard-valkey-redis-cluster-details.md +++ b/documentation/docs/reference/dashboards/dashboard-valkey-redis-cluster-details.md @@ -49,7 +49,7 @@ Sudden role changes may indicate planned failovers, automatic failover due to pr ## Replication Offsets -### [Service name] - Replica vs Master Offsets +### [Service name] - Replica vs Primary offsets Displays the replication offset difference between primary nodes and their replicas, measured in bytes. diff --git a/documentation/docs/reference/dashboards/dashboard-valkey-redis-replication.md b/documentation/docs/reference/dashboards/dashboard-valkey-redis-replication.md index 143645459c1..6d6ed72ec8d 100644 --- a/documentation/docs/reference/dashboards/dashboard-valkey-redis-replication.md +++ b/documentation/docs/reference/dashboards/dashboard-valkey-redis-replication.md @@ -20,7 +20,7 @@ The timeline view shows historical role states, helping correlate role changes w ## Replication Offsets -### [Replica service name] - Replica vs Master offsets +### [Replica service name] - Replica vs Primary offsets Displays replication offsets in bytes for both primary and replica nodes, showing how current each replica is with the primary's write operations.