Skip to content

Commit e344090

Browse files
DifferentialOrangeDifferentialOrange
committed
custom: rename cartridge-specific sections
This patch renames `cluster` and `replication` overview panels sections to `cluster_cartridge` and `replication_cartridge` since they use Cartridge-specific metrics [1]. This is a breaking change for all custom-built dashboard which had used them. It has no effect on our published dashboards. 1. tarantool/metrics#491 Part of #224
1 parent 87007ce commit e344090

13 files changed

+63
-57
lines changed

‎CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## Unreleased
88

9+
### Changed
10+
- Renamed build `cluster` panels section to `cluster_cartridge`.
11+
It affects all custom-built dashboards which had used `cluster` (#224)
12+
- Renamed build `replication` panels section to `replication_cartridge`.
13+
It affects all custom-built dashboards which had used `replication` (#224)
14+
915
### Fixed
1016
- Removed extra quotation mark for TDG jobs_average_panel query (#220)
1117

‎config.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ metrics_prefix: ''
5858

5959
# sections are dashboard panels sections to be included
6060
# The list of supported sections:
61-
# - cluster
62-
# - replication
61+
# - cluster_cartridge
62+
# - replication_cartridge
6363
# - http
6464
# - net
6565
# - slab
@@ -84,10 +84,10 @@ metrics_prefix: ''
8484
# - tdg_iproto
8585
# - tdg_rest_api
8686
# - tdg_tasks
87-
# default is [cluster, replication, http, net, slab, mvcc, space, vinyl, cpu, runtime, luajit, operations, crud, expirationd]
87+
# default is [cluster_cartridge, replication_cartridge, http, net, slab, mvcc, space, vinyl, cpu, runtime, luajit, operations, crud, expirationd]
8888
sections:
89-
- cluster
90-
- replication
89+
- cluster_cartridge
90+
- replication_cartridge
9191
- http
9292
- net
9393
- slab
@@ -131,8 +131,8 @@ sections:
131131
# job: ['=', 'MyJobWithTarantoolMetrics'],
132132
# }
133133
# sections:
134-
# - cluster
135-
# - replication
134+
# - cluster_cartridge
135+
# - replication_cartridge
136136
# - http
137137
# - net
138138
# - slab
@@ -150,8 +150,8 @@ sections:
150150
# job: ['=', 'MyJobWithTDGMetrics'],
151151
# }
152152
# sections:
153-
# - cluster
154-
# - replication
153+
# - cluster_cartridge
154+
# - replication_cartridge
155155
# - http
156156
# - net
157157
# - slab

‎dashboard/build/config.libsonnet

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ local variable = import 'dashboard/variable.libsonnet';
2727
filters: {},
2828
metrics_prefix: '',
2929
sections: [
30-
'cluster',
31-
'replication',
30+
'cluster_cartridge',
31+
'replication_cartridge',
3232
'http',
3333
'net',
3434
'slab',
@@ -54,8 +54,8 @@ local variable = import 'dashboard/variable.libsonnet';
5454
filters: {},
5555
metrics_prefix: '',
5656
sections: [
57-
'cluster',
58-
'replication',
57+
'cluster_cartridge',
58+
'replication_cartridge',
5959
'http',
6060
'net',
6161
'slab',

‎dashboard/build/from_ext_var.jsonnet

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ local grafana_tags =
2525
else if DASHBOARD_TEMPLATE == 'TDG' then ['tarantool', 'TDG'];
2626
local sections =
2727
if DASHBOARD_TEMPLATE == 'Tarantool' then [
28-
'cluster',
29-
'replication',
28+
'cluster_cartridge',
29+
'replication_cartridge',
3030
'http',
3131
'net',
3232
'slab',
@@ -41,8 +41,8 @@ local sections =
4141
'expirationd',
4242
]
4343
else if DASHBOARD_TEMPLATE == 'TDG' then [
44-
'cluster',
45-
'replication',
44+
'cluster_cartridge',
45+
'replication_cartridge',
4646
'net',
4747
'slab',
4848
'mvcc',

‎dashboard/section.libsonnet

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ local tdg_tuples = import 'dashboard/panels/tdg/tuples.libsonnet';
2727
local vinyl = import 'dashboard/panels/vinyl.libsonnet';
2828

2929
{
30-
cluster(cfg):: if cfg.type == variable.datasource_type.prometheus then [
30+
cluster_cartridge(cfg):: if cfg.type == variable.datasource_type.prometheus then [
3131
// Must be used only in the top of a dashboard, overall stat panels use complicated layout
3232
cluster.row,
3333
cluster.health_overview_table(cfg) { gridPos: { w: 12, h: 8, x: 0, y: 1 } },
@@ -57,7 +57,7 @@ local vinyl = import 'dashboard/panels/vinyl.libsonnet';
5757
cluster.election_term(cfg),
5858
],
5959

60-
replication(cfg):: [
60+
replication_cartridge(cfg):: [
6161
replication.row,
6262
replication.replication_status(cfg),
6363
replication.replication_lag(cfg),

‎tests/InfluxDB/dashboard.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ measurement: '$measurement'
88
filters:
99
label_pairs_alias: ['=~', '/^$alias$/']
1010
sections:
11-
- cluster
12-
- replication
11+
- cluster_cartridge
12+
- replication_cartridge
1313
- http
1414
- net
1515
- slab

‎tests/InfluxDB/dashboard_custom.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ filters:
1010
vendor_app_tag: ['=', 'MyCacheApplication']
1111
metrics_prefix: vendor_tt_
1212
sections:
13-
- cluster
14-
- replication
13+
- cluster_cartridge
14+
- replication_cartridge
1515
- http
1616
- net
1717
- slab

‎tests/InfluxDB/dashboard_tdg.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ measurement: "$measurement"
88
filters:
99
label_pairs_alias: ['=~', '/^$alias$/']
1010
sections:
11-
- cluster
12-
- replication
11+
- cluster_cartridge
12+
- replication_cartridge
1313
- net
1414
- slab
1515
- mvcc

‎tests/Prometheus/dashboard.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ filters:
77
job: ['=~', '$job']
88
alias: ['=~', '$alias']
99
sections:
10-
- cluster
11-
- replication
10+
- cluster_cartridge
11+
- replication_cartridge
1212
- http
1313
- net
1414
- slab

‎tests/Prometheus/dashboard_custom.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ filters:
88
vendor_app_label: ['=', 'MyCacheApplication']
99
metrics_prefix: vendor_tt_
1010
sections:
11-
- cluster
12-
- replication
11+
- cluster_cartridge
12+
- replication_cartridge
1313
- http
1414
- net
1515
- slab

‎tests/Prometheus/dashboard_tdg.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ filters:
77
job: ['=~', '$job']
88
alias: ['=~', '$alias']
99
sections:
10-
- cluster
11-
- replication
10+
- cluster_cartridge
11+
- replication_cartridge
1212
- net
1313
- slab
1414
- mvcc

‎tests/unit/config.jsonnet

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ local config_example = importstr 'config.yml';
4848
job: ['=', 'MyJobWithTarantoolMetrics'],
4949
}
5050
sections:
51-
- cluster
52-
- replication
51+
- cluster_cartridge
52+
- replication_cartridge
5353
- http
5454
- net
5555
- slab
@@ -68,8 +68,8 @@ local config_example = importstr 'config.yml';
6868
job: ['=', 'MyJobWithTDGMetrics'],
6969
}
7070
sections:
71-
- cluster
72-
- replication
71+
- cluster_cartridge
72+
- replication_cartridge
7373
- http
7474
- net
7575
- slab

‎tests/unit/config_compiled.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"metrics_prefix": "",
1111
"policy": "$policy",
1212
"sections": [
13-
"cluster",
14-
"replication",
13+
"cluster_cartridge",
14+
"replication_cartridge",
1515
"http",
1616
"net",
1717
"slab",
@@ -37,8 +37,8 @@
3737
],
3838
"metrics_prefix": "",
3939
"sections": [
40-
"cluster",
41-
"replication",
40+
"cluster_cartridge",
41+
"replication_cartridge",
4242
"http",
4343
"net",
4444
"slab",
@@ -73,8 +73,8 @@
7373
],
7474
"metrics_prefix": "",
7575
"sections": [
76-
"cluster",
77-
"replication",
76+
"cluster_cartridge",
77+
"replication_cartridge",
7878
"http",
7979
"net",
8080
"slab",
@@ -107,8 +107,8 @@
107107
"metrics_prefix": "",
108108
"policy": "$policy",
109109
"sections": [
110-
"cluster",
111-
"replication",
110+
"cluster_cartridge",
111+
"replication_cartridge",
112112
"http",
113113
"net",
114114
"slab",
@@ -136,8 +136,8 @@
136136
"metrics_prefix": "",
137137
"policy": "default",
138138
"sections": [
139-
"cluster",
140-
"replication",
139+
"cluster_cartridge",
140+
"replication_cartridge",
141141
"http",
142142
"net",
143143
"slab",
@@ -172,8 +172,8 @@
172172
],
173173
"metrics_prefix": "",
174174
"sections": [
175-
"cluster",
176-
"replication",
175+
"cluster_cartridge",
176+
"replication_cartridge",
177177
"http",
178178
"net",
179179
"slab",
@@ -205,8 +205,8 @@
205205
],
206206
"metrics_prefix": "",
207207
"sections": [
208-
"cluster",
209-
"replication",
208+
"cluster_cartridge",
209+
"replication_cartridge",
210210
"http",
211211
"net",
212212
"slab",
@@ -248,8 +248,8 @@
248248
],
249249
"metrics_prefix": "",
250250
"sections": [
251-
"cluster",
252-
"replication",
251+
"cluster_cartridge",
252+
"replication_cartridge",
253253
"http",
254254
"net",
255255
"slab",
@@ -284,8 +284,8 @@
284284
],
285285
"metrics_prefix": "",
286286
"sections": [
287-
"cluster",
288-
"replication",
287+
"cluster_cartridge",
288+
"replication_cartridge",
289289
"http",
290290
"net",
291291
"slab",
@@ -316,8 +316,8 @@
316316
],
317317
"metrics_prefix": "",
318318
"sections": [
319-
"cluster",
320-
"replication",
319+
"cluster_cartridge",
320+
"replication_cartridge",
321321
"http",
322322
"net",
323323
"slab",
@@ -340,8 +340,8 @@
340340
"metrics_prefix": "",
341341
"policy": "$policy",
342342
"sections": [
343-
"cluster",
344-
"replication",
343+
"cluster_cartridge",
344+
"replication_cartridge",
345345
"http",
346346
"net",
347347
"slab",

0 commit comments

Comments
 (0)