Skip to content

Commit fc634a5

Browse files
lua: bump metrics module
Bump metric package submodule to 1.6.1. Commits from PR[1-7] add new metrics to Tarantool. 1. tarantool/metrics#508 2. tarantool/metrics#516 3. tarantool/metrics#519 4. tarantool/metrics#521 5. tarantool/metrics#524 6. tarantool/metrics#527 7. tarantool/metrics#529 Closes #11950 @TarantoolBot document Title: Bump metrics module to 1.6.1 `'tnt_memory'`, `'tnt_memory_virt'`, `'schema_needs_upgrade'` are new metrics, introduced in metrics 1.6.0, and enabled by default. `'tnt_cartridge_config_checksum'` is new metric, introduced in metrics 1.5.0. New optional ``label_keys`` parameter for ``counter()`` and ``gauge()`` metrics are presented in metrics 1.4.0.
1 parent 9b3bec0 commit fc634a5

File tree

7 files changed

+54
-1
lines changed

7 files changed

+54
-1
lines changed
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
## feature/metrics
2+
3+
* Updated the metrics submodule to 1.6.1.
4+
5+
Changes in 1.6.1:
6+
7+
- Added a new `schema` metrics category with the `schema_needs_upgrade` metric, enabled by default
8+
([gh-524][mgh-524]) ([gh-529][mgh-529]).
9+
10+
Changes in 1.6.0:
11+
12+
- Added a new `memory` metric, enabled by default
13+
([gh-519][mgh-519]).
14+
15+
- Added a new `memory_virt` metric, enabled by default
16+
([gh-521][mgh-521]).
17+
18+
- Fixed possible `fio.read` errors
19+
([gh-527][mgh-527]).
20+
21+
Changes in 1.5.0:
22+
23+
- Added `tnt_cartridge_config_checksum` metric
24+
([gh-516][mgh-516]).
25+
26+
Changes in 1.4.0:
27+
28+
- New optional ``label_keys`` parameter for ``counter()`` and ``gauge()`` metrics
29+
([gh-508][mgh-508]).
30+
31+
[mgh-508]: https://github.com/tarantool/metrics/pull/508
32+
[mgh-516]: https://github.com/tarantool/metrics/pull/516
33+
[mgh-519]: https://github.com/tarantool/metrics/pull/519
34+
[mgh-521]: https://github.com/tarantool/metrics/pull/521
35+
[mgh-524]: https://github.com/tarantool/metrics/pull/524
36+
[mgh-527]: https://github.com/tarantool/metrics/pull/527
37+
[mgh-529]: https://github.com/tarantool/metrics/pull/529

src/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ lua_source(lua_sources ../third_party/checks/checks.lua checks_lua)
8787
lua_source(lua_sources ../third_party/metrics/metrics/api.lua metrics_api_lua)
8888
lua_source(lua_sources ../third_party/metrics/metrics/cartridge/failover.lua metrics_cartridge_failover_lua)
8989
lua_source(lua_sources ../third_party/metrics/metrics/cartridge/issues.lua metrics_cartridge_issues_lua)
90+
lua_source(lua_sources ../third_party/metrics/metrics/cartridge/config.lua metrics_cartridge_config_lua)
9091
lua_source(lua_sources ../third_party/metrics/metrics/cfg.lua metrics_cfg_lua)
9192
lua_source(lua_sources ../third_party/metrics/metrics/collectors/counter.lua metrics_collectors_counter_lua)
9293
lua_source(lua_sources ../third_party/metrics/metrics/collectors/gauge.lua metrics_collectors_gauge_lua)
@@ -117,6 +118,7 @@ lua_source(lua_sources ../third_party/metrics/metrics/tarantool/network.lua metr
117118
lua_source(lua_sources ../third_party/metrics/metrics/tarantool/operations.lua metrics_tarantool_operations_lua)
118119
lua_source(lua_sources ../third_party/metrics/metrics/tarantool/replicas.lua metrics_tarantool_replicas_lua)
119120
lua_source(lua_sources ../third_party/metrics/metrics/tarantool/runtime.lua metrics_tarantool_runtime_lua)
121+
lua_source(lua_sources ../third_party/metrics/metrics/tarantool/schema.lua metrics_tarantool_schema_lua)
120122
lua_source(lua_sources ../third_party/metrics/metrics/tarantool/slab.lua metrics_tarantool_slab_lua)
121123
lua_source(lua_sources ../third_party/metrics/metrics/tarantool/spaces.lua metrics_tarantool_spaces_lua)
122124
lua_source(lua_sources ../third_party/metrics/metrics/tarantool/system.lua metrics_tarantool_system_lua)

src/box/lua/config/instance_config.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,6 +1682,7 @@ return schema.new('instance_config', schema.record({
16821682
'clock',
16831683
'event_loop',
16841684
'cpu_extended',
1685+
'schema',
16851686
}),
16861687
exclude = schema.set({
16871688
'all',
@@ -1702,6 +1703,7 @@ return schema.new('instance_config', schema.record({
17021703
'clock',
17031704
'event_loop',
17041705
'cpu_extended',
1706+
'schema',
17051707
}),
17061708
labels = schema.map({
17071709
key = schema.scalar({type = 'string'}),

src/box/lua/init.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ extern char session_lua[],
114114
metrics_api_lua[],
115115
metrics_cartridge_failover_lua[],
116116
metrics_cartridge_issues_lua[],
117+
metrics_cartridge_config_lua[],
117118
metrics_cfg_lua[],
118119
metrics_collectors_shared_lua[],
119120
metrics_collectors_counter_lua[],
@@ -144,6 +145,7 @@ extern char session_lua[],
144145
metrics_tarantool_operations_lua[],
145146
metrics_tarantool_replicas_lua[],
146147
metrics_tarantool_runtime_lua[],
148+
metrics_tarantool_schema_lua[],
147149
metrics_tarantool_slab_lua[],
148150
metrics_tarantool_spaces_lua[],
149151
metrics_tarantool_system_lua[],
@@ -272,6 +274,8 @@ static const char *lua_sources[] = {
272274
"metrics.cartridge.failover", metrics_cartridge_failover_lua,
273275
"third_party/metrics/metrics/cartridge/issues",
274276
"metrics.cartridge.issues", metrics_cartridge_issues_lua,
277+
"third_party/metrics/metrics/cartridge/config",
278+
"metrics.cartridge.config", metrics_cartridge_config_lua,
275279
"third_party/metrics/metrics/psutils/psutils_linux",
276280
"metrics.psutils.psutils_linux", metrics_psutils_psutils_linux_lua,
277281
"third_party/metrics/metrics/psutils/cpu",
@@ -302,6 +306,8 @@ static const char *lua_sources[] = {
302306
"metrics.tarantool.replicas", metrics_tarantool_replicas_lua,
303307
"third_party/metrics/metrics/tarantool/runtime",
304308
"metrics.tarantool.runtime", metrics_tarantool_runtime_lua,
309+
"third_party/metrics/metrics/tarantool/schema",
310+
"metrics.tarantool.schema", metrics_tarantool_schema_lua,
305311
"third_party/metrics/metrics/tarantool/slab",
306312
"metrics.tarantool.slab", metrics_tarantool_slab_lua,
307313
"third_party/metrics/metrics/tarantool/spaces",
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
require('test.metrics-luatest.helper')
2+
3+
require('third_party.metrics.test.tarantool.memory_metrics_test')
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
require('test.metrics-luatest.helper')
2+
3+
require('third_party.metrics.test.tarantool.schema_test')

0 commit comments

Comments
 (0)