Skip to content

Commit

Permalink
dashboard: replace deprecated luajit metrics
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@DifferentialOrange
DifferentialOrange committed Feb 28, 2023
1 parent 8465929 commit 763fefe
Show file tree
Hide file tree
Showing 17 changed files with 383 additions and 374 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased

### Changed
- Replace LuaJit deprecated metrics with new ones


## [1.5.0] - 2022-09-22
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).

Expand Down
31 changes: 17 additions & 14 deletions dashboard/panels/luajit.libsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ local common = import 'dashboard/panels/common.libsonnet';
local version_warning(description) =
std.join('\n\n', [description, 'Panel works with `metrics >= 0.6.0` and `Tarantool >= 2.6`.']),

local version_warning_renamed(description) =
std.join('\n\n', [description, 'Panel works with `metrics >= 0.15.0` and `Tarantool >= 2.6`.']),

snap_restores(
title='Snap restores',
description=|||
Expand All @@ -20,13 +23,13 @@ local common = import 'dashboard/panels/common.libsonnet';
alias=null,
):: common.default_graph(
title=title,
description=version_warning(description),
description=version_warning_renamed(description),
datasource=datasource,
labelY1='restores per second',
panel_width=6,
).addTarget(common.default_rps_target(
datasource_type,
'lj_jit_snap_restore',
'lj_jit_snap_restore_total',
job,
policy,
measurement,
Expand Down Expand Up @@ -72,13 +75,13 @@ local common = import 'dashboard/panels/common.libsonnet';
alias=null,
):: common.default_graph(
title=title,
description=version_warning(description),
description=version_warning_renamed(description),
datasource=datasource,
labelY1='aborts per second',
panel_width=6,
).addTarget(common.default_rps_target(
datasource_type,
'lj_jit_trace_abort',
'lj_jit_trace_abort_total',
job,
policy,
measurement,
Expand Down Expand Up @@ -125,13 +128,13 @@ local common = import 'dashboard/panels/common.libsonnet';
alias=null,
):: common.default_graph(
title=title,
description=version_warning(description),
description=version_warning_renamed(description),
datasource=datasource,
labelY1='interned per second',
panel_width=12,
).addTarget(common.default_rps_target(
datasource_type,
'lj_strhash_hit',
'lj_strhash_hit_total',
job,
policy,
measurement,
Expand All @@ -151,13 +154,13 @@ local common = import 'dashboard/panels/common.libsonnet';
alias=null,
):: common.default_graph(
title=title,
description=version_warning(description),
description=version_warning_renamed(description),
datasource=datasource,
labelY1='allocated per second',
panel_width=12,
).addTarget(common.default_rps_target(
datasource_type,
'lj_strhash_miss',
'lj_strhash_miss_total',
job,
policy,
measurement,
Expand All @@ -179,7 +182,7 @@ local common = import 'dashboard/panels/common.libsonnet';
description=(
if description != null then
description
else version_warning(std.format(|||
else version_warning_renamed(std.format(|||
Average count of incremental GC steps (%s state) per second.
|||, state))
),
Expand All @@ -188,7 +191,7 @@ local common = import 'dashboard/panels/common.libsonnet';
panel_width=8,
).addTarget(common.default_rps_target(
datasource_type,
std.format('lj_gc_steps_%s', state),
std.format('lj_gc_steps_%s_total', state),
job,
policy,
measurement,
Expand Down Expand Up @@ -478,14 +481,14 @@ local common = import 'dashboard/panels/common.libsonnet';
alias=null,
):: common.default_graph(
title=title,
description=version_warning(description),
description=version_warning_renamed(description),
datasource=datasource,
format='bytes',
labelY1='bytes per second',
panel_width=8,
).addTarget(common.default_rps_target(
datasource_type,
'lj_gc_freed',
'lj_gc_freed_total',
job,
policy,
measurement,
Expand All @@ -505,14 +508,14 @@ local common = import 'dashboard/panels/common.libsonnet';
alias=null,
):: common.default_graph(
title=title,
description=version_warning(description),
description=version_warning_renamed(description),
datasource=datasource,
format='bytes',
labelY1='bytes per second',
panel_width=8,
).addTarget(common.default_rps_target(
datasource_type,
'lj_gc_allocated',
'lj_gc_allocated_total',
job,
policy,
measurement,
Expand Down
48 changes: 24 additions & 24 deletions supported_metrics.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,38 +25,38 @@ Based on [tarantool/metrics 0.15.0](https://github.com/tarantool/metrics/release
- [x] **tnt_replication_lag**: see *Cluster overview/Tarantool replication lag* panel ([#133](https://github.com/tarantool/grafana-dashboard/issues/133))
- [x] **tnt_replication_status**: see *Cluster overview/Tarantool replication status* panel ([#133](https://github.com/tarantool/grafana-dashboard/issues/133))
- [x] **tnt_read_only**: see *Cluster overview/Tarantool instance status* panel ([#133](https://github.com/tarantool/grafana-dashboard/issues/133))
- [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))
- [ ] **lj_jit_snap_restore_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- **lj_jit_snap_restore**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_jit_snap_restore_total**)
- [x] **lj_jit_snap_restore_total**: see *Tarantool LuaJit statistics/Snap restores* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- [x] **lj_jit_trace_num**: see *Tarantool LuaJit statistics/JIT traces written* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
- [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))
- [ ] **lj_jit_trace_abort_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- **lj_jit_trace_abort**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_jit_trace_abort_total**)
- [x] **lj_jit_trace_abort_total**: see *Tarantool LuaJit statistics/JIT traces aborted* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- [x] **lj_jit_mcode_size**: see *Tarantool LuaJit statistics/Machine code areas* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
- [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))
- [ ] **lj_strhash_hit_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- [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))
- [ ] **lj_strhash_miss_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- [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))
- [ ] **lj_gc_steps_atomic_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- [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))
- [ ] **lj_gc_steps_sweepstring_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- [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))
- [ ] **lj_gc_steps_finalize_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- [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))
- [ ] **lj_gc_steps_sweep_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- [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))
- [ ] **lj_gc_steps_propagate_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- [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))
- [ ] **lj_gc_steps_pause_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- **lj_strhash_hit**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_strhash_hit_total**)
- [x] **lj_strhash_hit_total**: see *Tarantool LuaJit statistics/Strings interned* ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- **lj_strhash_miss**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_strhash_miss_total**)
- [x] **lj_strhash_miss_total**: see *Tarantool LuaJit statistics/Strings allocated* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- **lj_gc_steps_atomic**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_steps_atomic_total**)
- [x] **lj_gc_steps_atomic_total**: see *Tarantool LuaJit statistics/GC steps (atomic)* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- **lj_gc_steps_sweepstring**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_steps_sweepstring_total**)
- [x] **lj_gc_steps_sweepstring_total**: see *Tarantool LuaJit statistics/GC steps (sweepstring)* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- **lj_gc_steps_finalize**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_steps_finalize_total**)
- [x] **lj_gc_steps_finalize_total**: see *Tarantool LuaJit statistics/GC steps (finalize)* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- **lj_gc_steps_sweep**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_steps_sweep_total**)
- [x] **lj_gc_steps_sweep_total**: see *Tarantool LuaJit statistics/GC steps (sweep)* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- **lj_gc_steps_propagate**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_steps_propagate_total**)
- [x] **lj_gc_steps_propagate_total**: see *Tarantool LuaJit statistics/GC steps (propagate)* panel([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- **lj_gc_steps_pause**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_steps_pause_total**)
- [x] **lj_gc_steps_pause_total**: see *Tarantool LuaJit statistics/GC steps (pause)* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- [x] **lj_gc_strnum**: see *Tarantool LuaJit statistics/String objects allocated* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
- [x] **lj_gc_tabnum**: see *Tarantool LuaJit statistics/Table objects allocated* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
- [x] **lj_gc_cdatanum**: see *Tarantool LuaJit statistics/cdata objects allocated* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
- [x] **lj_gc_udatanum**: see *Tarantool LuaJit statistics/userdata objects allocated* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
- [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))
- [ ] **lj_gc_freed_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- **lj_gc_freed**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_freed_total**)
- [x] **lj_gc_freed_total**: see *Tarantool LuaJit statistics/Freed Lua memory* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- [x] **lj_gc_memory**: see *Tarantool LuaJit statistics/Current Lua memory* panel ([#75](https://github.com/tarantool/grafana-dashboard/issues/75))
- **lj_gc_total**: unsupported ([#75](https://github.com/tarantool/grafana-dashboard/issues/75), deprecated, replaced with **lj_gc_memory**)
- [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))
- [ ] **lj_gc_allocated_total** ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- **lj_gc_allocated**: unsupported ([#179](https://github.com/tarantool/grafana-dashboard/issues/179), deprecated, replaced by **lj_gc_allocated_total**)
- [x] **lj_gc_allocated_total**: see *Tarantool LuaJit statistics/Allocated Lua memory* panel ([#179](https://github.com/tarantool/grafana-dashboard/issues/179))
- [x] **tnt_info_memory_tx**: see *Tarantool runtime overview/Transactions memory* panel ([#137](https://github.com/tarantool/grafana-dashboard/issues/137))
- **tnt_info_memory_index**: unsupported (decided not to support: superseded by slab, vinyl and space metrics)
- [x] **tnt_info_memory_net**: see *Tarantool network activity/Net memory* panel ([#137](https://github.com/tarantool/grafana-dashboard/issues/137))
Expand Down
Loading

0 comments on commit 763fefe

Please sign in to comment.