Skip to content

Commit 6b5e8ca

Browse files
dashboard: replace deprecated luajit metrics
Replace deprecated LuaJit metrics with newer ones. Metrics were deprecated in 0.15.0 and removed in 0.16.0 [1]. 1. https://github.com/tarantool/metrics/blob/master/CHANGELOG.md Closes #179
1 parent 5a04623 commit 6b5e8ca

17 files changed

+383
-374
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
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+
### Changed
10+
- Replace LuaJit deprecated metrics with new ones
11+
12+
713
## [1.5.0] - 2022-09-22
814
Grafana revisions: [InfluxDB revision 15](https://grafana.com/api/dashboards/12567/revisions/15/download), [Prometheus revision 15](https://grafana.com/api/dashboards/13054/revisions/15/download), [InfluxDB TDG revision 4](https://grafana.com/api/dashboards/16405/revisions/4/download), [Prometheus TDG revision 4](https://grafana.com/api/dashboards/16406/revisions/4/download).
915

dashboard/panels/luajit.libsonnet

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ local common = import 'dashboard/panels/common.libsonnet';
66
local version_warning(description) =
77
std.join('\n\n', [description, 'Panel works with `metrics >= 0.6.0` and `Tarantool >= 2.6`.']),
88

9+
local version_warning_renamed(description) =
10+
std.join('\n\n', [description, 'Panel works with `metrics >= 0.15.0` and `Tarantool >= 2.6`.']),
11+
912
snap_restores(
1013
title='Snap restores',
1114
description=|||
@@ -20,13 +23,13 @@ local common = import 'dashboard/panels/common.libsonnet';
2023
alias=null,
2124
):: common.default_graph(
2225
title=title,
23-
description=version_warning(description),
26+
description=version_warning_renamed(description),
2427
datasource=datasource,
2528
labelY1='restores per second',
2629
panel_width=6,
2730
).addTarget(common.default_rps_target(
2831
datasource_type,
29-
'lj_jit_snap_restore',
32+
'lj_jit_snap_restore_total',
3033
job,
3134
policy,
3235
measurement,
@@ -72,13 +75,13 @@ local common = import 'dashboard/panels/common.libsonnet';
7275
alias=null,
7376
):: common.default_graph(
7477
title=title,
75-
description=version_warning(description),
78+
description=version_warning_renamed(description),
7679
datasource=datasource,
7780
labelY1='aborts per second',
7881
panel_width=6,
7982
).addTarget(common.default_rps_target(
8083
datasource_type,
81-
'lj_jit_trace_abort',
84+
'lj_jit_trace_abort_total',
8285
job,
8386
policy,
8487
measurement,
@@ -125,13 +128,13 @@ local common = import 'dashboard/panels/common.libsonnet';
125128
alias=null,
126129
):: common.default_graph(
127130
title=title,
128-
description=version_warning(description),
131+
description=version_warning_renamed(description),
129132
datasource=datasource,
130133
labelY1='interned per second',
131134
panel_width=12,
132135
).addTarget(common.default_rps_target(
133136
datasource_type,
134-
'lj_strhash_hit',
137+
'lj_strhash_hit_total',
135138
job,
136139
policy,
137140
measurement,
@@ -151,13 +154,13 @@ local common = import 'dashboard/panels/common.libsonnet';
151154
alias=null,
152155
):: common.default_graph(
153156
title=title,
154-
description=version_warning(description),
157+
description=version_warning_renamed(description),
155158
datasource=datasource,
156159
labelY1='allocated per second',
157160
panel_width=12,
158161
).addTarget(common.default_rps_target(
159162
datasource_type,
160-
'lj_strhash_miss',
163+
'lj_strhash_miss_total',
161164
job,
162165
policy,
163166
measurement,
@@ -179,7 +182,7 @@ local common = import 'dashboard/panels/common.libsonnet';
179182
description=(
180183
if description != null then
181184
description
182-
else version_warning(std.format(|||
185+
else version_warning_renamed(std.format(|||
183186
Average count of incremental GC steps (%s state) per second.
184187
|||, state))
185188
),
@@ -188,7 +191,7 @@ local common = import 'dashboard/panels/common.libsonnet';
188191
panel_width=8,
189192
).addTarget(common.default_rps_target(
190193
datasource_type,
191-
std.format('lj_gc_steps_%s', state),
194+
std.format('lj_gc_steps_%s_total', state),
192195
job,
193196
policy,
194197
measurement,
@@ -478,14 +481,14 @@ local common = import 'dashboard/panels/common.libsonnet';
478481
alias=null,
479482
):: common.default_graph(
480483
title=title,
481-
description=version_warning(description),
484+
description=version_warning_renamed(description),
482485
datasource=datasource,
483486
format='bytes',
484487
labelY1='bytes per second',
485488
panel_width=8,
486489
).addTarget(common.default_rps_target(
487490
datasource_type,
488-
'lj_gc_freed',
491+
'lj_gc_freed_total',
489492
job,
490493
policy,
491494
measurement,
@@ -505,14 +508,14 @@ local common = import 'dashboard/panels/common.libsonnet';
505508
alias=null,
506509
):: common.default_graph(
507510
title=title,
508-
description=version_warning(description),
511+
description=version_warning_renamed(description),
509512
datasource=datasource,
510513
format='bytes',
511514
labelY1='bytes per second',
512515
panel_width=8,
513516
).addTarget(common.default_rps_target(
514517
datasource_type,
515-
'lj_gc_allocated',
518+
'lj_gc_allocated_total',
516519
job,
517520
policy,
518521
measurement,

supported_metrics.md

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,38 @@ Based on [tarantool/metrics 0.15.0](https://github.com/tarantool/metrics/release
2525
- [x] **tnt_replication_lag**: see *Cluster overview/Tarantool replication lag* panel ([#133](https://github.com/tarantool/grafana-dashboard/issues/133))
2626
- [x] **tnt_replication_status**: see *Cluster overview/Tarantool replication status* panel ([#133](https://github.com/tarantool/grafana-dashboard/issues/133))
2727
- [x] **tnt_read_only**: see *Cluster overview/Tarantool instance status* panel ([#133](https://github.com/tarantool/grafana-dashboard/issues/133))
28-
- [x] **lj_jit_snap_restore**: see *Tarantool LuaJit statistics/Snap restores* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), will be removed in [#179](https://github.com/tarantool/grafana-dashboard/issues/179))
29-
- [ ] **lj_jit_snap_restore_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
28+
- **lj_jit_snap_restore**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_jit_snap_restore_total**)
29+
- [x] **lj_jit_snap_restore_total**: see *Tarantool LuaJit statistics/Snap restores* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
3030
- [x] **lj_jit_trace_num**: see *Tarantool LuaJit statistics/JIT traces written* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
31-
- [x] **lj_jit_trace_abort**: see *Tarantool LuaJit statistics/JIT traces aborted* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), will be removed in [#179](https://github.com/tarantool/grafana-dashboard/issues/179))
32-
- [ ] **lj_jit_trace_abort_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
31+
- **lj_jit_trace_abort**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_jit_trace_abort_total**)
32+
- [x] **lj_jit_trace_abort_total**: see *Tarantool LuaJit statistics/JIT traces aborted* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
3333
- [x] **lj_jit_mcode_size**: see *Tarantool LuaJit statistics/Machine code areas* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
34-
- [x] **lj_strhash_hit**: see *Tarantool LuaJit statistics/Strings interned* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), will be removed in [#179](https://github.com/tarantool/grafana-dashboard/issues/179))
35-
- [ ] **lj_strhash_hit_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
36-
- [x] **lj_strhash_miss**: see *Tarantool LuaJit statistics/Strings allocated* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), will be removed in [#179](https://github.com/tarantool/grafana-dashboard/issues/179))
37-
- [ ] **lj_strhash_miss_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
38-
- [x] **lj_gc_steps_atomic**: see *Tarantool LuaJit statistics/GC steps (atomic)* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), will be removed in [#179](https://github.com/tarantool/grafana-dashboard/issues/179))
39-
- [ ] **lj_gc_steps_atomic_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
40-
- [x] **lj_gc_steps_sweepstring**: see *Tarantool LuaJit statistics/GC steps (sweepstring)* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), will be removed in [#179](https://github.com/tarantool/grafana-dashboard/issues/179))
41-
- [ ] **lj_gc_steps_sweepstring_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
42-
- [x] **lj_gc_steps_finalize**: see *Tarantool LuaJit statistics/GC steps (finalize)* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), will be removed in [#179](https://github.com/tarantool/grafana-dashboard/issues/179))
43-
- [ ] **lj_gc_steps_finalize_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
44-
- [x] **lj_gc_steps_sweep**: see *Tarantool LuaJit statistics/GC steps (sweep)* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), will be removed in [#179](https://github.com/tarantool/grafana-dashboard/issues/179))
45-
- [ ] **lj_gc_steps_sweep_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
46-
- [x] **lj_gc_steps_propagate**: see *Tarantool LuaJit statistics/GC steps (propagate)* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), will be removed in [#179](https://github.com/tarantool/grafana-dashboard/issues/179))
47-
- [ ] **lj_gc_steps_propagate_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
48-
- [x] **lj_gc_steps_pause**: see *Tarantool LuaJit statistics/GC steps (pause)* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), will be removed in [#179](https://github.com/tarantool/grafana-dashboard/issues/179))
49-
- [ ] **lj_gc_steps_pause_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
34+
- **lj_strhash_hit**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_strhash_hit_total**)
35+
- [x] **lj_strhash_hit_total**: see *Tarantool LuaJit statistics/Strings interned* ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
36+
- **lj_strhash_miss**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_strhash_miss_total**)
37+
- [x] **lj_strhash_miss_total**: see *Tarantool LuaJit statistics/Strings allocated* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
38+
- **lj_gc_steps_atomic**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_steps_atomic_total**)
39+
- [x] **lj_gc_steps_atomic_total**: see *Tarantool LuaJit statistics/GC steps (atomic)* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
40+
- **lj_gc_steps_sweepstring**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_steps_sweepstring_total**)
41+
- [x] **lj_gc_steps_sweepstring_total**: see *Tarantool LuaJit statistics/GC steps (sweepstring)* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
42+
- **lj_gc_steps_finalize**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_steps_finalize_total**)
43+
- [x] **lj_gc_steps_finalize_total**: see *Tarantool LuaJit statistics/GC steps (finalize)* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
44+
- **lj_gc_steps_sweep**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_steps_sweep_total**)
45+
- [x] **lj_gc_steps_sweep_total**: see *Tarantool LuaJit statistics/GC steps (sweep)* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
46+
- **lj_gc_steps_propagate**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_steps_propagate_total**)
47+
- [x] **lj_gc_steps_propagate_total**: see *Tarantool LuaJit statistics/GC steps (propagate)* panel([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
48+
- **lj_gc_steps_pause**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_steps_pause_total**)
49+
- [x] **lj_gc_steps_pause_total**: see *Tarantool LuaJit statistics/GC steps (pause)* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
5050
- [x] **lj_gc_strnum**: see *Tarantool LuaJit statistics/String objects allocated* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
5151
- [x] **lj_gc_tabnum**: see *Tarantool LuaJit statistics/Table objects allocated* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
5252
- [x] **lj_gc_cdatanum**: see *Tarantool LuaJit statistics/cdata objects allocated* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
5353
- [x] **lj_gc_udatanum**: see *Tarantool LuaJit statistics/userdata objects allocated* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
54-
- [x] **lj_gc_freed**: see *Tarantool LuaJit statistics/Freed Lua memory* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), will be removed in [#179](https://github.com/tarantool/grafana-dashboard/issues/179))
55-
- [ ] **lj_gc_freed_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
54+
- **lj_gc_freed**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_freed_total**)
55+
- [x] **lj_gc_freed_total**: see *Tarantool LuaJit statistics/Freed Lua memory* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
5656
- [x] **lj_gc_memory**: see *Tarantool LuaJit statistics/Current Lua memory* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
5757
- **lj_gc_total**: unsupported ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), deprecated, replaced with **lj_gc_memory**)
58-
- [x] **lj_gc_allocated**: see *Tarantool LuaJit statistics/Allocated Lua memory* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), will be removed in [#179](https://github.com/tarantool/grafana-dashboard/issues/179))
59-
- [ ] **lj_gc_allocated_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
58+
- **lj_gc_allocated**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_allocated_total**)
59+
- [x] **lj_gc_allocated_total**: see *Tarantool LuaJit statistics/Allocated Lua memory* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
6060
- [x] **tnt_info_memory_tx**: see *Tarantool runtime overview/Transactions memory* panel ([#137](https://github.com/tarantool/grafana-dashboard/issues/137))
6161
- **tnt_info_memory_index**: unsupported (decided not to support: superseded by slab, vinyl and space metrics)
6262
- [x] **tnt_info_memory_net**: see *Tarantool network activity/Net memory* panel ([#137](https://github.com/tarantool/grafana-dashboard/issues/137))

0 commit comments

Comments
 (0)