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 background resource group label name #49654

Merged
merged 1 commit into from
Dec 22, 2023
Merged

metrics: change background resource group label name #49654

merged 1 commit into from
Dec 22, 2023

Conversation

glorv
Copy link
Contributor

@glorv glorv commented Dec 21, 2023

What problem does this PR solve?

Issue Number: ref #49318

Problem Summary:

What changed and how does it work?

Change the resource group name from "name" to "resource_group" so we can add a global label selector later. Related tikv side change is tikv/tikv#16192.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Side effects

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

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot ti-chi-bot bot added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Dec 21, 2023
@tiprow tiprow
Copy link

tiprow bot commented Dec 21, 2023

Hi @glorv. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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 kubernetes/test-infra repository.

@glorv
Copy link
Contributor Author

glorv commented Dec 21, 2023

/ok-to-test

@ti-chi-bot ti-chi-bot bot added the ok-to-test Indicates a PR is ready to be tested. label Dec 21, 2023
@codecov Codecov
Copy link

codecov bot commented Dec 21, 2023 •
edited
Loading

Codecov Report

Merging #49654 (9fbf948) into master (11aefee) will increase coverage by 0.3692%.
Report is 12 commits behind head on master.
The diff coverage is n/a.

Additional details and impacted files 
@@               Coverage Diff                @@
##             master     #49654        +/-   ##
================================================
+ Coverage   70.9842%   71.3534%   +0.3692%     
================================================
  Files          1368       1423        +55     
  Lines        398566     416326     +17760     
================================================
+ Hits         282919     297063     +14144     
- Misses        95882     100468      +4586     
+ Partials      19765      18795       -970
Flag Coverage Δ
integration 43.6598% <ø> (?)
unit 70.9842% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 53.9663% <ø> (ø)
parser ∅ <ø> (∅)
br 46.9586% <ø> (-5.9386%) ⬇️

nolouch
nolouch reviewed Dec 21, 2023
View reviewed changes
pkg/metrics/grafana/tidb_resource_control.json
@@ -3073,7 +3073,7 @@
"format": "time_series",
"interval": "",
"intervalFactor": 2,
"legendFormat": "{{name}}-{{instance}}",
"legendFormat": "{{resource_group}}-{{instance}}",
Copy link
Member

Choose a reason for hiding this comment

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

pd already changed in tikv/pd#7547. maybe adjust it together.

Copy link
Contributor

Choose a reason for hiding this comment

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

+1

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If we change other already used expressions after the user upgrades from the old version, old data will be lost due to expression change. We can change background expressions because it is an experimental feature.

Copy link
Member

Choose a reason for hiding this comment

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

got

nolouch
nolouch approved these changes Dec 22, 2023
View reviewed changes
Copy link
Member

@nolouch nolouch 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 the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 22, 2023
@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 22, 2023
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 22, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-22 02:48:03.539260818 +0000 UTC m=+1188374.576487745: ☑️ agreed by nolouch.
  • 2023-12-22 03:47:30.170786376 +0000 UTC m=+1191941.208013288: ☑️ agreed by CabinfeverB.

@glorv
Copy link
Contributor Author

glorv commented Dec 22, 2023

/approve

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

ti-chi-bot bot commented Dec 22, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CabinfeverB, glorv, nolouch

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added the approved label Dec 22, 2023
@ti-chi-bot ti-chi-bot bot merged commit 4073030 into pingcap:master Dec 22, 2023
18 checks passed
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. label Feb 18, 2024
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot mentioned this pull request Feb 18, 2024
Merged
13 tasks
ti-chi-bot bot pushed a commit that referenced this pull request Feb 19, 2024
@ti-chi-bot
metrics: change background resource group label name (#49654) (#51119)
081ea9a 
ref #49318
@ti-chi-bot ti-chi-bot added needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. and removed needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. labels Apr 18, 2024
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Apr 18, 2024
@glorv @ti-chi-bot
This is an automated cherry-pick of pingcap#49654
9935a63 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@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

@CabinfeverB CabinfeverB CabinfeverB approved these changes

@Connor1996 Connor1996 Awaiting requested review from Connor1996

Assignees
No one assigned
Labels
approved lgtm needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@glorv @ti-chi-bot @nolouch @CabinfeverB