Skip to content

Commit 784c5dd

Browse files
dashboard: use consistent style for requirements
Before this patch, two different styles were used to note possible metrics display issues: one similar to luarocks and human-readable one for non-rock entities. This patch updated these descriptions to be consistent.
1 parent 64724eb commit 784c5dd

21 files changed

+1018
-1045
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ 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+
### Changed
10+
- Use consistent style for panel requirements (PR #231)
11+
12+
### Fixed
13+
- Missing panel requirement for vinyl Bloom filter panel (PR #231)
14+
15+
716
## [3.0.0] - 2024-07-09
817
Grafana revisions:
918
- Tarantool 3:

dashboard/panels/cluster.libsonnet

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -345,8 +345,8 @@ local prometheus = grafana.prometheus;
345345
failover and switchover issues, clock issues, memory fragmentation,
346346
configuration issues and alien members warnings.
347347
348-
Panel works with `cartridge >= 2.0.2`, `metrics >= 0.6.0`,
349-
while `metrics >= 0.9.0` is recommended for per instance display.
348+
Panel minimal requirements: cartridge 2.0.2, metrics 0.6.0;
349+
at least metrics 0.9.0 is recommended for per instance display.
350350
|||,
351351
):: cartridge_issues(
352352
cfg,
@@ -363,8 +363,8 @@ local prometheus = grafana.prometheus;
363363
"critical" issues includes replication process critical fails and
364364
running out of available memory.
365365
366-
Panel works with `cartridge >= 2.0.2`, `metrics >= 0.6.0`,
367-
while `metrics >= 0.9.0` is recommended for per instance display.
366+
Panel minimal requirements: cartridge 2.0.2, metrics 0.6.0;
367+
at least metrics 0.9.0 is recommended for per instance display.
368368
|||,
369369
):: cartridge_issues(
370370
cfg,
@@ -380,7 +380,7 @@ local prometheus = grafana.prometheus;
380380
Displays the count of failover triggers in a replicaset.
381381
Graph shows average per second.
382382
383-
Panel works with `metrics >= 0.15.0`.
383+
Panel minimal requirements: metrics 0.15.0.
384384
|||,
385385
):: common.default_graph(
386386
cfg,
@@ -400,7 +400,7 @@ local prometheus = grafana.prometheus;
400400
write operations. `replica` status means instance is
401401
available only for read operations.
402402
403-
Panel works with `metrics >= 0.11.0` and Grafana 8.x.
403+
Panel minimal requirements: metrics 0.11.0, Grafana 8.
404404
|||,
405405
panel_width=12,
406406
):: timeseries.new(
@@ -423,7 +423,7 @@ local prometheus = grafana.prometheus;
423423
local election_warning(description) = std.join(
424424
'\n',
425425
[description, |||
426-
Panel works with metrics 0.15.0 or newer, Tarantool 2.6.1 or newer.
426+
Panel minimal requirements: metrics 0.15.0, Tarantool 2.6.1.
427427
|||]
428428
),
429429

@@ -438,7 +438,7 @@ local prometheus = grafana.prometheus;
438438
`candidate`s are nodes that start a new election round.
439439
`leader` is a node that collected a quorum of votes.
440440
441-
Panel works with Grafana 8.x.
441+
Panel minimal requirements: Grafana 8.
442442
|||),
443443
):: timeseries.new(
444444
title=title,

dashboard/panels/cpu.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ local prometheus = grafana.prometheus;
3434
spent by instance process executing in user mode.
3535
Metrics obtained using `getrusage()` call.
3636
37-
Panel works with `metrics >= 0.8.0`.
37+
Panel minimal requirements: metrics 0.8.0.
3838
|||,
3939
):: getrusage_cpu_percentage_graph(
4040
cfg=cfg,
@@ -51,7 +51,7 @@ local prometheus = grafana.prometheus;
5151
spent by instance process executing in kernel mode.
5252
Metrics obtained using `getrusage()` call.
5353
54-
Panel works with `metrics >= 0.8.0`.
54+
Panel minimal requirements: metrics 0.8.0.
5555
|||,
5656
):: getrusage_cpu_percentage_graph(
5757
cfg=cfg,

dashboard/panels/luajit.libsonnet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ local common = import 'dashboard/panels/common.libsonnet';
44
row:: common.row('Tarantool LuaJit statistics'),
55

66
local version_warning(description) =
7-
std.join('\n\n', [description, 'Panel works with `metrics >= 0.6.0` and `Tarantool >= 2.6`.']),
7+
std.join('\n\n', [description, 'Panel minimal requirements: metrics 0.6.0, Tarantool 2.6.']),
88

99
local version_warning_renamed(description) =
10-
std.join('\n\n', [description, 'Panel works with `metrics >= 0.15.0` and `Tarantool >= 2.6`.']),
10+
std.join('\n\n', [description, 'Panel minimal requirements: metrics 0.15.0, Tarantool 2.6.']),
1111

1212
snap_restores(
1313
cfg,

dashboard/panels/mvcc.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ local prometheus = grafana.prometheus;
1212
local mvcc_warning(description) = std.join(
1313
'\n',
1414
[description, |||
15-
Panel works with metrics 0.15.1 or newer, Tarantool 2.10 or newer.
15+
Panel minimal requirements: metrics 0.15.1, Tarantool 2.10.
1616
|||]
1717
),
1818

dashboard/panels/net.libsonnet

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ local prometheus = grafana.prometheus;
114114
description=|||
115115
Average number of requests processed by tx thread per second.
116116
117-
Panel works with `metrics >= 0.13.0` and `Tarantool >= 2.10-beta2`.
117+
Panel minimal requirements: metrics 0.13.0, Tarantool 2.10-beta2.
118118
|||,
119119
):: common.default_graph(
120120
cfg,
@@ -132,7 +132,7 @@ local prometheus = grafana.prometheus;
132132
description=|||
133133
Number of requests currently being processed in the tx thread.
134134
135-
Panel works with `metrics >= 0.13.0` and `Tarantool >= 2.10-beta2`.
135+
Panel minimal requirements: metrics 0.13.0, Tarantool 2.10-beta2.
136136
|||,
137137
):: common.default_graph(
138138
cfg,
@@ -152,7 +152,7 @@ local prometheus = grafana.prometheus;
152152
Average number of requests which was placed in queues
153153
of streams per second.
154154
155-
Panel works with `metrics >= 0.13.0` and `Tarantool >= 2.10-beta2`.
155+
Panel minimal requirements: metrics 0.13.0, Tarantool 2.10-beta2.
156156
|||,
157157
):: common.default_graph(
158158
cfg,
@@ -170,7 +170,7 @@ local prometheus = grafana.prometheus;
170170
description=|||
171171
Number of requests currently waiting in queues of streams.
172172
173-
Panel works with `metrics >= 0.13.0` and `Tarantool >= 2.10-beta2`.
173+
Panel minimal requirements: metrics 0.13.0, Tarantool 2.10-beta2.
174174
|||,
175175
):: common.default_graph(
176176
cfg,
@@ -219,7 +219,7 @@ local prometheus = grafana.prometheus;
219219
local per_thread_warning(description) = std.join(
220220
'\n',
221221
[description, |||
222-
Panel works with metrics 0.15.0 or newer, Tarantool 2.10 or newer.
222+
Panel minimal requirements: metrics 0.15.0, Tarantool 2.10.
223223
|||]
224224
),
225225

dashboard/panels/operations.libsonnet

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ local prometheus = grafana.prometheus;
182182
SQL prepare calls.
183183
Graph shows average calls per second.
184184
185-
Panel works with Tarantool 2.x.
185+
Panel minimal requirements: Tarantool 2.
186186
|||,
187187
):: operation_rps(
188188
cfg,
@@ -199,7 +199,7 @@ local prometheus = grafana.prometheus;
199199
SQL execute calls.
200200
Graph shows average calls per second.
201201
202-
Panel works with Tarantool 2.x.
202+
Panel minimal requirements: Tarantool 2.
203203
|||,
204204
):: operation_rps(
205205
cfg,
@@ -218,7 +218,7 @@ local prometheus = grafana.prometheus;
218218
operations with `TRANSACTION START` and IPROTO_BEGIN operations.
219219
Graph shows average calls per second.
220220
221-
Panel works with Tarantool 2.10 or newer.
221+
Panel minimal requirements: Tarantool 2.10.
222222
|||,
223223
):: operation_rps(
224224
cfg,
@@ -237,7 +237,7 @@ local prometheus = grafana.prometheus;
237237
operations with `COMMIT` and IPROTO_COMMIT operations.
238238
Graph shows average calls per second.
239239
240-
Panel works with Tarantool 2.10 or newer.
240+
Panel minimal requirements: Tarantool 2.10.
241241
|||,
242242
):: operation_rps(
243243
cfg,
@@ -256,7 +256,7 @@ local prometheus = grafana.prometheus;
256256
operations with `ROLLBACK` and IPROTO_ROLLBACK operations.
257257
Graph shows average calls per second.
258258
259-
Panel works with Tarantool 2.10 or newer.
259+
Panel minimal requirements: Tarantool 2.10.
260260
|||,
261261
):: operation_rps(
262262
cfg,

dashboard/panels/replication.libsonnet

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ local prometheus = grafana.prometheus;
1717
`follows` status means replication is running.
1818
Otherwise, `not running` is displayed.
1919
20-
Panel works with `metrics >= 0.13.0` and Grafana 8.x.
20+
Panel minimal requirements: metrics 0.13.0, Grafana 8.
2121
|||,
2222
panel_width=8,
2323
):: timeseries.new(
@@ -52,7 +52,7 @@ local prometheus = grafana.prometheus;
5252
description=|||
5353
Replication lag value for Tarantool instance.
5454
55-
Panel works with `metrics >= 0.13.0`.
55+
Panel minimal requirements: metrics 0.13.0.
5656
|||,
5757
panel_width=8,
5858
):: common.default_graph(
@@ -83,7 +83,7 @@ local prometheus = grafana.prometheus;
8383
max shows difference with the fastest clock (always positive),
8484
min shows difference with the slowest clock (always negative).
8585
86-
Panel works with `metrics >= 0.10.0`.
86+
Panel minimal requirements: metrics 0.10.0.
8787
|||,
8888
):: common.default_graph(
8989
cfg,
@@ -110,7 +110,7 @@ local prometheus = grafana.prometheus;
110110
local syncro_warning(description) = std.join(
111111
'\n',
112112
[description, |||
113-
Panel works with metrics 0.15.0 or newer, Tarantool 2.8.1 or newer.
113+
Panel minimal requirements: metrics 0.15.0, Tarantool 2.8.1.
114114
|||]
115115
),
116116

@@ -174,7 +174,7 @@ local prometheus = grafana.prometheus;
174174
description=syncro_warning(|||
175175
Whether the queue is processing any system entry (CONFIRM/ROLLBACK/PROMOTE/DEMOTE).
176176
177-
Panel works with Grafana 8.x.
177+
Panel minimal requirements: Grafana 8.
178178
|||),
179179
):: timeseries.new(
180180
title=title,

dashboard/panels/runtime.libsonnet

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,9 @@ local common = import 'dashboard/panels/common.libsonnet';
7070
cfg,
7171
title='Number of fibers',
7272
description=|||
73-
Current number of fibers in tx thread.
73+
Current number of fibers in tx thread.
7474
75-
Panel works with `metrics >= 0.13.0`.
75+
Panel minimal requirements: metrics 0.13.0.
7676
|||,
7777
):: common.default_graph(
7878
cfg,
@@ -152,7 +152,7 @@ local common = import 'dashboard/panels/common.libsonnet';
152152
possible bad health signals and may be the
153153
reason of "Too long WAL write" errors.
154154
155-
Panel works with `metrics >= 0.13.0`.
155+
Panel minimal requirements: metrics 0.13.0.
156156
|||,
157157
):: common.default_graph(
158158
cfg,

dashboard/panels/space.libsonnet

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ local prometheus = grafana.prometheus;
6666
to enable it you must set global variable
6767
include_vinyl_count to true. Beware that
6868
count() operation scans the space and may
69-
slow down your app.
69+
slow down your app.
7070
71-
Panel works with `metrics >= 0.13.0`.
71+
Panel minimal requirements: metrics 0.13.0.
7272
|||,
7373
):: count(
7474
cfg,
@@ -118,8 +118,7 @@ local prometheus = grafana.prometheus;
118118
|||,
119119
if cfg.type == variable.datasource_type.influxdb then
120120
|||
121-
`No data` may be displayed because of tarantool/metrics issue #321,
122-
use `metrics >= 0.12.0` to fix.
121+
Panel minimal requirements: metrics 0.12.0.
123122
|||
124123
else null,
125124
]
@@ -171,8 +170,7 @@ local prometheus = grafana.prometheus;
171170
|||,
172171
if cfg.type == variable.datasource_type.influxdb then
173172
|||
174-
`No data` may be displayed because of tarantool/metrics issue #321,
175-
use `metrics >= 0.12.0` to fix.
173+
Panel minimal requirements: metrics 0.12.0.
176174
|||
177175
else null,
178176
]

0 commit comments

Comments
 (0)