Skip to content

metrics: fix memory metrics (#11656)#12814

Closed
ti-srebot wants to merge 1 commit intotikv:release-4.0from
ti-srebot:release-4.0-c5c030d02d3a
Closed

metrics: fix memory metrics (#11656)#12814
ti-srebot wants to merge 1 commit intotikv:release-4.0from
ti-srebot:release-4.0-c5c030d02d3a

Conversation

@ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jun 14, 2022 •
edited
Loading

cherry-pick #11656 to release-4.0
You can switch your code base to this Pull Request by using git-extras:

# In tikv repo:
git pr https://github.com/tikv/tikv/pull/12814

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tikv.git pr/12814:release-4.0-c5c030d02d3a

Signed-off-by: Shuaipeng Yu jackysp@gmail.com

What is changed and how it works?

Close #11662

What's Changed:
TiKV dashboard on Grafana gets all memory usage jobs from Prometheus, which makes user confused.
image, fix it.
image

Related changes

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

Check List

Tests

  • No code

Side effects

  • Performance regression
    • Consumes more CPU
    • Consumes more MEM
  • Breaking backward compatibility

Release note 

None

@jackysp @ti-srebot
cherry pick tikv#11656 to release-4.0
7100628 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 14, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • youjiali1995
  • zhangjinpeng1987

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.

Details

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

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jun 14, 2022

@ti-srebot: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

Details

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.

@ti-chi-bot ti-chi-bot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Jun 14, 2022
@ti-srebot
Copy link
Contributor Author

ti-srebot commented Jun 14, 2022

/run-all-tests

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jun 14, 2022
@ti-srebot ti-srebot mentioned this pull request Jun 14, 2022
Merged
@ti-srebot ti-srebot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick Type: PR - Cherry pick type/enhancement The issue or PR belongs to an enhancement. labels Jun 14, 2022
@ti-srebot ti-srebot added this to the v4.0.16 milestone Jun 14, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 14, 2022
zhangjinpeng87
zhangjinpeng87 approved these changes Jun 15, 2022
View reviewed changes
Copy link
Member

@zhangjinpeng87 zhangjinpeng87 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 added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 15, 2022
@VelocityLight
Copy link

VelocityLight commented Sep 21, 2022

This pull request is closed because it's related version has closed automatic cherry-picking.
If it's still needed, you can reopen it or just regenerate it using bot,
see:

You can find more details at:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@youjiali1995 youjiali1995 youjiali1995 approved these changes

@zhangjinpeng87 zhangjinpeng87 zhangjinpeng87 approved these changes

@overvenus overvenus Awaiting requested review from overvenus

@rleungx rleungx Awaiting requested review from rleungx

Assignees

@jackysp jackysp

Labels

do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick Type: PR - Cherry pick type/enhancement The issue or PR belongs to an enhancement.

Projects

None yet

Milestone

v4.0.16

Development

Successfully merging this pull request may close these issues.

6 participants

@ti-srebot @ti-chi-bot @VelocityLight @youjiali1995 @zhangjinpeng87 @jackysp