Skip to content

Commit 1053f8c

Browse files
p0rtaleoleg-jukovec
authored andcommitted
Remove tnt_cartridge_config_applied metric
1 parent b77047c commit 1053f8c

File tree

6 files changed

+4
-71
lines changed

6 files changed

+4
-71
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212

1313
### Fixed
1414

15+
### Removed
16+
17+
- `tnt_cartridge_config_applied` metric that only reflected local node state.
18+
1519
## [1.4.0] - 2025-07-07
1620

1721
### Added

doc/monitoring/api_reference.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,6 @@ Metrics functions
570570
* ``luajit``
571571
* ``cartridge_issues``
572572
* ``cartridge_failover``
573-
* ``cartridge_config``
574573
* ``clock``
575574
* ``event_loop``
576575
* ``config``

doc/monitoring/metrics_reference.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -414,9 +414,6 @@ Cartridge
414414
* - ``tnt_cartridge_failover_trigger_total``
415415
- Count of failover triggers in cluster.
416416

417-
* - ``tnt_cartridge_config_applied``
418-
- Whether the Cartridge configuration was successfully applied (1 if applied, 0 otherwise).
419-
420417
.. _metrics-reference-luajit:
421418

422419
LuaJIT metrics

metrics/cartridge/config.lua

Lines changed: 0 additions & 32 deletions
This file was deleted.

metrics/tarantool.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ local default_metrics = {
2222
luajit = require('metrics.tarantool.luajit'),
2323
cartridge_issues = require('metrics.cartridge.issues'),
2424
cartridge_failover = require('metrics.cartridge.failover'),
25-
cartridge_config = require('metrics.cartridge.config'),
2625
clock = require('metrics.tarantool.clock'),
2726
event_loop = require('metrics.tarantool.event_loop'),
2827
config = require('metrics.tarantool.config'),

test/integration/cartridge_metrics_test.lua

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -144,37 +144,3 @@ g.test_failover = function()
144144
g.cluster.main_server:start()
145145
g.cluster:wait_until_healthy()
146146
end
147-
148-
g.test_config_applied = function()
149-
helpers.skip_cartridge_version_less('2.16.1')
150-
local main_server = g.cluster:server('main')
151-
152-
t.helpers.retrying({}, function()
153-
local resp = main_server:http_request('get', '/metrics')
154-
local config_metric = utils.find_metric('tnt_cartridge_config_applied', resp.json)
155-
156-
t.assert_is_not(config_metric, nil, 'Cartridge config applied metric presents in /metrics response')
157-
t.assert_equals(config_metric[1].value, 1, 'Config should be applied')
158-
end)
159-
end
160-
161-
g.test_config_not_applied = function()
162-
helpers.skip_cartridge_version_less('2.16.1')
163-
local main_server = g.cluster:server('main')
164-
165-
main_server.net_box:eval([[
166-
local patch = require('cartridge').config_patch_clusterwide
167-
local ok, err = patch({
168-
['conflict'] = {},
169-
['conflict.yml'] = "text",
170-
})
171-
]])
172-
173-
t.helpers.retrying({}, function()
174-
local resp = main_server:http_request('get', '/metrics')
175-
local config_metric = utils.find_metric('tnt_cartridge_config_applied', resp.json)
176-
177-
t.assert_is_not(config_metric, nil, 'Cartridge config applied metric presents in /metrics response')
178-
t.assert_equals(config_metric[1].value, 0, 'Config should not be applied')
179-
end)
180-
end

0 commit comments

Comments
 (0)