Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add zone label for Tarantool Cartridge 2.4.0 #201

Merged
merged 1 commit into from Mar 17, 2021
Merged

Add zone label for Tarantool Cartridge 2.4.0 #201

merged 1 commit into from Mar 17, 2021

Conversation

no1seman
Copy link
Contributor

@no1seman no1seman commented Feb 22, 2021 •
edited

What has been done? Why? What problem is being solved?

Added zone label for instance metrics to support zones introduced in Tarantool Cartridge 2.4.0

I didn't forget about

  • Tests
  • Changelog
  • Documentation (README and rst)
  • Rockspec and rpm spec

Close #194

Note: promtool has an issue: prometheus/prometheus#8480 but it doesn't helps.

@no1seman no1seman changed the title Add zone alias for Tarantool Cartridge 2.4.0 Add zone label for Tarantool Cartridge 2.4.0 Feb 22, 2021
@yngvar-antonsson yngvar-antonsson linked an issue Mar 11, 2021 that may be closed by this pull request
Broken Promtool test #202
Closed
yngvar-antonsson
yngvar-antonsson requested changes Mar 12, 2021
View reviewed changes
cartridge/roles/metrics.lua Outdated Show resolved Hide resolved
cartridge/roles/metrics.lua Outdated Show resolved Hide resolved
cartridge/roles/metrics.lua Outdated Show resolved Hide resolved
test/integration/cartridge_role_test.lua Outdated Show resolved Hide resolved
test/integration/cartridge_role_test.lua Outdated Show resolved Hide resolved
yngvar-antonsson
yngvar-antonsson requested changes Mar 15, 2021
View reviewed changes
test/integration/cartridge_role_test.lua Outdated Show resolved Hide resolved
test/integration/cartridge_role_test.lua Outdated Show resolved Hide resolved
RunsFor
RunsFor reviewed Mar 15, 2021
View reviewed changes
.github/workflows/test.yml Outdated Show resolved Hide resolved
@no1seman no1seman requested a review from RunsFor March 15, 2021 19:08
RunsFor
RunsFor approved these changes Mar 15, 2021
View reviewed changes
Copy link
Contributor

@RunsFor RunsFor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

add zone label
a46d280 
Fix promtool version

Set promtool version=2.25.0

Set promtool to latest

Fix promtool #4

Fix promtool #5

Fix promtool #6

Fix promtool #7

Fix promtool #8

Fix promtool #9

Fix promtool #11

Fix review comments

Fix check_cartridge_version() helper

CI: Add Cartridge 2.5.0 to test matrix
@yngvar-antonsson yngvar-antonsson mentioned this pull request Mar 17, 2021
Closed
vasiliy-t
vasiliy-t approved these changes Mar 17, 2021
View reviewed changes
doc/monitoring/getting_started.rst
@@ -178,6 +178,10 @@ via configuration.
local cartridge = require('cartridge')
local metrics = cartridge.service_get('metrics')

#. There is an ability in Tarantool Cartridge >= ``'2.4.0'`` to set a zone for each
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we add ref to zone's doc page?

@yngvar-antonsson yngvar-antonsson merged commit 7188d6b into master Mar 17, 2021
@vasiliy-t vasiliy-t deleted the add_zone_alias branch April 8, 2021 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RunsFor RunsFor RunsFor approved these changes

@vasiliy-t vasiliy-t vasiliy-t approved these changes

@yngvar-antonsson yngvar-antonsson yngvar-antonsson approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Broken Promtool test Add zone label
4 participants
@no1seman @RunsFor @vasiliy-t @yngvar-antonsson