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

metrics: change resource group label name #16192

Merged
merged 6 commits into from Dec 21, 2023
Merged

metrics: change resource group label name #16192

merged 6 commits into from Dec 21, 2023

Conversation

glorv
Copy link
Contributor

@glorv glorv commented Dec 18, 2023

What is changed and how it works?

Issue Number: Close #16191

What's Changed:

change metrics label name for resource-group-name from "name" to "resource_group".

To be backward compatible with old grafana panel, we add a new label name and keep the old one. We are going to deprecate the old label in v8.0.

Related changes

  • PR to update pingcap/docs/pingcap/docs-cn:
  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Release note

None

@glorv
change resource group label name
57d4cd7 
Signed-off-by: glorv <glorvs@163.com>
@glorv
add TODO comment
2a1d2d3 
Signed-off-by: glorv <glorvs@163.com>
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 18, 2023 •
edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • Connor1996
  • nolouch

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot bot added the size/M label Dec 18, 2023
nolouch
nolouch reviewed Dec 19, 2023
View reviewed changes
components/resource_control/src/metrics.rs Outdated
@@ -4,22 +4,25 @@ use lazy_static::*;
use prometheus::*;

lazy_static! {
// TODO: deprecate the "name" label in v8.0.
Copy link
Contributor

Choose a reason for hiding this comment

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

I see some metrics not introduced in the Grafana template. maybe we can directly rename some metrics in TiKV

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All the metrics changed in this PR are used in grafana. The background related metrics panels are defined in the Resource-Control page in tidb repo.

@bufferflies
Copy link
Contributor

the grafana.json file needs to change also.

@glorv
Copy link
Contributor Author

glorv commented Dec 19, 2023

the grafana.json file needs to change also.

@bufferflies We want to keep backward compatibility with v7.x so the expression in grafana is not changed. Maybe we can change it in v8.0

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Status: PR - There is already 1 approval label Dec 19, 2023
Connor1996
Connor1996 reviewed Dec 19, 2023
View reviewed changes
components/resource_control/src/metrics.rs Outdated
@@ -4,22 +4,25 @@ use lazy_static::*;
use prometheus::*;

lazy_static! {
// TODO: deprecate the "name" label in v8.0.
Copy link
Member

Choose a reason for hiding this comment

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

why not replace it directly, grafana panel should be updated with the version

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There is a problem that if we replace it, after a cluster is upgraded from old version, old metrics data will lost due to new expression. @nolouch do you think we should keep this compatibility?

Copy link
Contributor

Choose a reason for hiding this comment

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

IMO, the background relatives can be replaced directly due to no cases using it currently. if we do we need to pick to release-7.5

Connor1996
Connor1996 approved these changes Dec 20, 2023
View reviewed changes
Copy link
Member

@Connor1996 Connor1996 left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot bot added status/LGT2 Status: PR - There are already 2 approvals and removed status/LGT1 Status: PR - There is already 1 approval labels Dec 20, 2023
@glorv
Copy link
Contributor Author

glorv commented Dec 21, 2023

/merge

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 21, 2023

@glorv: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 21, 2023

This pull request has been accepted and is ready to merge.

Commit hash: 0f8126a

@ti-chi-bot ti-chi-bot bot added the status/can-merge Status: Can merge to base branch label Dec 21, 2023
@glorv
Copy link
Contributor Author

glorv commented Dec 21, 2023

/hold

@glorv
no need to backwark compatible for background metrics
36cc99c 
Signed-off-by: glorv <glorvs@163.com>
@ti-chi-bot ti-chi-bot bot removed the status/can-merge Status: Can merge to base branch label Dec 21, 2023
@glorv
Copy link
Contributor Author

glorv commented Dec 21, 2023

/unhold

@glorv
Copy link
Contributor Author

glorv commented Dec 21, 2023

/merge

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 21, 2023

@glorv: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 21, 2023

This pull request has been accepted and is ready to merge.

Commit hash: 8806e90

@ti-chi-bot ti-chi-bot bot added the status/can-merge Status: Can merge to base branch label Dec 21, 2023
@ti-chi-bot ti-chi-bot bot merged commit fe80806 into tikv:master Dec 21, 2023
6 of 7 checks passed
@ti-chi-bot ti-chi-bot bot added this to the Pool milestone Dec 21, 2023
@glorv glorv deleted the rg-label branch December 21, 2023 05:16
@glorv glorv mentioned this pull request Dec 21, 2023
Merged
13 tasks
@nolouch
Copy link
Contributor

nolouch commented Jan 3, 2024

/run-cherry-picker

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #16283.

@ti-chi-bot ti-chi-bot mentioned this pull request Jan 3, 2024
Merged
9 tasks
ti-chi-bot pushed a commit to ti-chi-bot/tikv that referenced this pull request Jan 3, 2024
@glorv @ti-chi-bot
This is an automated cherry-pick of tikv#16192
fc2b80e 
close tikv#16191

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot bot pushed a commit that referenced this pull request Jan 3, 2024
@ti-chi-bot @glorv @nolouch
metrics: change resource group label name (#16192) (#16283)
ce1c0ab 
close #16191

change metrics label name for resource-group-name from "name" to "resource_group".

To be backward compatible with old grafana panel, we add a new label name and keep the old one. We are going to deprecate the old label in v8.0.

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: nolouch <nolouch@gmail.com>

Co-authored-by: glorv <glorvs@163.com>
Co-authored-by: nolouch <nolouch@gmail.com>
@ti-chi-bot ti-chi-bot mentioned this pull request Feb 18, 2024
Merged
13 tasks
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 18, 2024
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nolouch nolouch nolouch approved these changes

@Connor1996 Connor1996 Connor1996 approved these changes

@bufferflies bufferflies Awaiting requested review from bufferflies

Assignees
No one assigned
Labels
needs-cherry-pick-release-7.5 release-note-none size/M status/can-merge Status: Can merge to base branch status/LGT2 Status: PR - There are already 2 approvals
Projects
None yet
Milestone
Pool
Development

Successfully merging this pull request may close these issues.

unify the metrics label of resource group name
5 participants
@glorv @bufferflies @nolouch @ti-chi-bot @Connor1996