Skip to content

Commit 9e515d1

Browse files
committedSep 22, 2022
dashboard: add instance variable
Instance alias variable can be used to select displayed cluster instances for a dashboard. For InfluxDB dashboards, set of instances is based on available in database label_pairs_alias values. For Prometheus dashboards, set of instances is based on available in database alias labels of tnt_uptime_info metric. After this patch, each panel (except for Prometheus cluster aggregation panels) include instance filters in queries. After this patch, there are two different forms of static build dashboards are available: with or without instance variable. Closes #181
1 parent efd01e3 commit 9e515d1

File tree

64 files changed

+101076
-1143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+101076
-1143
lines changed
 

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## Unreleased
8+
9+
### Added
10+
- Variable to select displayed cluster instances
11+
12+
713
## [1.4.0] - 2022-08-03
814
Grafana revisions: [InfluxDB revision 14](https://grafana.com/api/dashboards/12567/revisions/14/download), [Prometheus revision 14](https://grafana.com/api/dashboards/13054/revisions/14/download), [InfluxDB TDG revision 3](https://grafana.com/api/dashboards/16405/revisions/3/download), [Prometheus TDG revision 3](https://grafana.com/api/dashboards/16406/revisions/3/download).
915

‎Makefile

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
JOB ?= tarantool
22
POLICY ?= autogen
33
MEASUREMENT ?= tarantool_http
4+
WITH_INSTANCE_VARIABLE ?= FALSE
45
OUTPUT_STATIC_DASHBOARD ?= dashboard.json
56

67
.PHONY: build-deps
@@ -16,9 +17,11 @@ ifndef DATASOURCE
1617
false
1718
endif
1819
# JOB is optional, default is "tarantool"
20+
# WITH_INSTANCE_VARIABLE is optional, default is "FALSE"
1921
jsonnet -J ./vendor -J . \
2022
--ext-str DATASOURCE=${DATASOURCE} \
2123
--ext-str JOB=${JOB} \
24+
--ext-str WITH_INSTANCE_VARIABLE=${WITH_INSTANCE_VARIABLE} \
2225
dashboard/build/prometheus/${DASHBOARD_BUILD_SOURCE} -o ${OUTPUT_STATIC_DASHBOARD}
2326

2427
.PHONY: build-static-prometheus
@@ -37,10 +40,12 @@ ifndef DATASOURCE
3740
endif
3841
# POLICY is optional, default is "autogen"
3942
# MEASUREMENT is optional, default is "tarantool_http"
43+
# WITH_INSTANCE_VARIABLE is optional, default is "FALSE"
4044
jsonnet -J ./vendor -J . \
4145
--ext-str DATASOURCE=${DATASOURCE} \
4246
--ext-str POLICY=${POLICY} \
4347
--ext-str MEASUREMENT=${MEASUREMENT} \
48+
--ext-str WITH_INSTANCE_VARIABLE=${WITH_INSTANCE_VARIABLE} \
4449
dashboard/build/influxdb/${DASHBOARD_BUILD_SOURCE} -o ${OUTPUT_STATIC_DASHBOARD}
4550

4651
.PHONY: build-static-influxdb

0 commit comments

Comments
 (0)
Please sign in to comment.