metrics: fix memory metrics (#11656) by ti-srebot · Pull Request #12811 · tikv/tikv

ti-srebot · 2022-06-14T02:58:17Z

cherry-pick #11656 to release-5.3
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/12811

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

git push git@github.com:ti-srebot/tikv.git pr/12811:release-5.3-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.
, fix it.

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

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-chi-bot · 2022-06-14T02:58:19Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

glorv
youjiali1995

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-srebot · 2022-06-14T02:58:26Z

/run-all-tests

ti-srebot · 2022-06-14T02:58:42Z

@jackysp please accept the invitation then you can push to the cherry-pick pull requests. Comment with /cherry-pick-invite if the invitation is expired.
https://github.com/ti-srebot/tikv/invitations

Signed-off-by: glorv <glorvs@163.com>

zhangjinpeng87

LGTM

5kbpers · 2022-06-15T07:30:05Z

/merge

ti-chi-bot · 2022-06-15T07:30:06Z

@5kbpers: 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.

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 ti-community-infra/tichi repository.

ti-chi-bot · 2022-06-15T07:30:08Z

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

Details

Commit hash: 27077e3

Signed-off-by: glorv <glorvs@163.com>

…/tikv into release-5.3-c5c030d02d3a

jackysp · 2022-06-16T02:22:59Z

metrics/grafana/tikv_details.json

          "targets": [
            {
-              "expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}) by (instance)",
+              "expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", job=~\"tikv\"}) by (instance)",


Suggested change

"expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", job=~\"tikv\"}) by (instance)",

"expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", job=~\".*tikv\"}) by (instance)",

jackysp · 2022-06-16T02:23:19Z

metrics/grafana/tikv_summary.json

          "targets": [
            {
-              "expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}) by (instance)",
+              "expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", job=~\"tikv\"}) by (instance)",


Suggested change

"expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", job=~\"tikv\"}) by (instance)",

"expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", job=~\".*tikv\"}) by (instance)",

jackysp · 2022-06-16T02:23:29Z

metrics/grafana/tikv_trouble_shooting.json

          "targets": [
            {
-              "expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\"}) by (instance)",
+              "expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", job=~\"tikv\"}) by (instance)",


Suggested change

"expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", job=~\"tikv\"}) by (instance)",

"expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", job=~\".*tikv\"}) by (instance)",

Signed-off-by: glorv <glorvs@163.com>

glorv · 2022-06-16T09:32:27Z

/merge

ti-chi-bot · 2022-06-16T09:32:27Z

@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.

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 ti-community-infra/tichi repository.

ti-chi-bot · 2022-06-16T09:32:29Z

@glorv: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

Details

In response to this:

/merge

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.

Connor1996 · 2022-06-16T09:49:03Z

/merge

ti-chi-bot · 2022-06-16T09:49:04Z

@Connor1996: 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.

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 ti-community-infra/tichi repository.

ti-chi-bot · 2022-06-16T09:49:06Z

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

Details

Commit hash: ae5dc05

ti-chi-bot · 2022-06-16T09:49:19Z

@ti-srebot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

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.

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 ti-community-infra/tichi repository.

cherry pick tikv#11656 to release-5.3

1173f67

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request Jun 14, 2022

metrics: fix memory metrics #11656

Merged

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 requested review from overvenus, rleungx and youjiali1995 June 14, 2022 02:58

ti-srebot added this to the v5.3.1 milestone Jun 14, 2022

ti-srebot assigned jackysp Jun 14, 2022

VelocityLight removed the do-not-merge/cherry-pick-not-approved label Jun 14, 2022

ti-chi-bot added the do-not-merge/cherry-pick-not-approved label Jun 14, 2022

VelocityLight added the cherry-pick-approved Cherry pick PR approved by release team. label Jun 14, 2022

ti-chi-bot removed the do-not-merge/cherry-pick-not-approved label Jun 14, 2022

resolve comments

80edd65

Signed-off-by: glorv <glorvs@163.com>

glorv approved these changes Jun 14, 2022

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 14, 2022

youjiali1995 approved these changes Jun 14, 2022

View reviewed changes

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 14, 2022

zhangjinpeng87 approved these changes Jun 15, 2022

View reviewed changes

Merge branch 'release-5.3' into release-5.3-c5c030d02d3a

27077e3

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 15, 2022

ti-chi-bot and others added 3 commits June 15, 2022 15:30

Merge branch 'release-5.3' into release-5.3-c5c030d02d3a

cd58152

fix expression

6926c5a

Signed-off-by: glorv <glorvs@163.com>

Merge branch 'release-5.3-c5c030d02d3a' of ssh://github.com/ti-srebot…

78ec414

…/tikv into release-5.3-c5c030d02d3a

ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Jun 15, 2022

jackysp reviewed Jun 16, 2022

View reviewed changes

fix expression

ae5dc05

Signed-off-by: glorv <glorvs@163.com>

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 16, 2022

Merge branch 'release-5.3' into release-5.3-c5c030d02d3a

db0fdc7

ti-chi-bot merged commit 39297b0 into tikv:release-5.3 Jun 16, 2022

heibaijian modified the milestones: v5.3.1, v5.3.2 Jun 20, 2022

	"expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", job=~\"tikv\"}) by (instance)",
	"expr": "avg(process_resident_memory_bytes{tidb_cluster=\"$tidb_cluster\", instance=~\"$instance\", job=~\".*tikv\"}) by (instance)",

Conversation

ti-srebot commented Jun 14, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What is changed and how it works?

Related changes

Check List

Release note

Uh oh!

ti-chi-bot commented Jun 14, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ti-srebot commented Jun 14, 2022

Uh oh!

ti-srebot commented Jun 14, 2022

Uh oh!

zhangjinpeng87 left a comment

Choose a reason for hiding this comment

Uh oh!

5kbpers commented Jun 15, 2022

Uh oh!

ti-chi-bot commented Jun 15, 2022

Uh oh!

ti-chi-bot commented Jun 15, 2022

Uh oh!

jackysp Jun 16, 2022

Choose a reason for hiding this comment

Uh oh!

jackysp Jun 16, 2022

Choose a reason for hiding this comment

Uh oh!

jackysp Jun 16, 2022

Choose a reason for hiding this comment

Uh oh!

glorv commented Jun 16, 2022

Uh oh!

ti-chi-bot commented Jun 16, 2022

Uh oh!

ti-chi-bot commented Jun 16, 2022

Uh oh!

Connor1996 commented Jun 16, 2022

Uh oh!

ti-chi-bot commented Jun 16, 2022

Uh oh!

ti-chi-bot commented Jun 16, 2022

Uh oh!

ti-chi-bot commented Jun 16, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

ti-srebot commented Jun 14, 2022 •

edited

Loading

ti-chi-bot commented Jun 14, 2022 •

edited

Loading