Skip to content

Commit e344090

Browse files
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

File tree

13 files changed

+63
-57
lines changed

13 files changed

+63
-57
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
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

Lines changed: 9 additions & 9 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

0 commit comments

Comments
 (0)