From d821e13c24d426afa92be2a6602f009dee38f42b Mon Sep 17 00:00:00 2001
From: Dima Lazerka <58356625+dima-vm@users.noreply.github.com>
Date: Mon, 29 Apr 2024 12:11:28 +0300
Subject: [PATCH] deployment/dashboards: properly show version for non-stable
docker images (#6150)
re: .*-(?:tags|heads)-(.*)-(?:0|dirty)-.*
cases:
victoria-metrics-20240419-160209-heads-enterprise-single-node-0-g08f933ab0c
enterprise-single-node
victoria-metrics-20240201-133950-tags-v1.97.1-enterprise-0-g760a8733b
v1.97.1-enterprise
victoria-metrics-20240419-160209-heads-rotation-part-2-0-ge2367b6d1-dirty-848b54cd
rotation-part-2-0-ge2367b6d1
victoria-metrics-20240419-160209-heads-lts-1.93-enterprise-search-contention-0-g30ef4aad21-amd64
lts-1.93-enterprise-search-contention
victoria-metrics-20240425-150852-tags-v1.101.0-enterprise-0-g718138c64
v1.101.0-enterprise
Signed-off-by: hagen1778 <roman@victoriametrics.com>
Co-authored-by: Dzmitry Lazerka <dlazerka@gmail.com>
Co-authored-by: hagen1778 <roman@victoriametrics.com>
(cherry picked from commit 564463259a1f7c8aec3c17e77d8c9dcea198e787)
---
dashboards/victoriametrics.json | 4 ++--
dashboards/vm/victoriametrics.json | 4 ++--
docs/CHANGELOG.md | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dashboards/victoriametrics.json b/dashboards/victoriametrics.json
index 3ffe1b91bc..d4f5995257 100644
--- a/dashboards/victoriametrics.json
+++ b/dashboards/victoriametrics.json
@@ -5796,7 +5796,7 @@
"refId": "VictoriaMetrics-version-Variable-Query"
},
"refresh": 1,
- "regex": "/.*-tags-(v\\d+\\.\\d+\\.\\d+)/",
+ "regex": "/.*-(?:tags|heads)-(.*)-(?:0|dirty)-.*/",
"skipUrlSync": false,
"sort": 2,
"tagValuesQuery": "",
@@ -5874,6 +5874,6 @@
"timezone": "",
"title": "VictoriaMetrics - single-node",
"uid": "wNf0q_kZk",
- "version": 1,
+ "version": 2,
"weekStart": ""
}
diff --git a/dashboards/vm/victoriametrics.json b/dashboards/vm/victoriametrics.json
index 19dc547dd3..fe2a5df176 100644
--- a/dashboards/vm/victoriametrics.json
+++ b/dashboards/vm/victoriametrics.json
@@ -5797,7 +5797,7 @@
"refId": "VictoriaMetrics-version-Variable-Query"
},
"refresh": 1,
- "regex": "/.*-tags-(v\\d+\\.\\d+\\.\\d+)/",
+ "regex": "/.*-(?:tags|heads)-(.*)-(?:0|dirty)-.*/",
"skipUrlSync": false,
"sort": 2,
"tagValuesQuery": "",
@@ -5875,6 +5875,6 @@
"timezone": "",
"title": "VictoriaMetrics - single-node (VM)",
"uid": "wNf0q_kZk_vm",
- "version": 1,
+ "version": 2,
"weekStart": ""
}
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index e724c6b108..4408031097 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -31,6 +31,7 @@ See also [LTS releases](https://docs.victoriametrics.com/lts-releases/).
## tip
* FEATURE: [dashboards/single](https://grafana.com/grafana/dashboards/10229): support selecting of multiple instances on the dashboard. See [this issue](https://github.com/VictoriaMetrics/VictoriaMetrics/issues/5869) for details.
+* FEATURE: [dashboards/single](https://grafana.com/grafana/dashboards/10229): properly display version in the Stats row for the custom builds of VictoriaMetrics.
## [v1.101.0](https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.101.0)