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.

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

metrics: support multi-k8s in grafana dashboards #4658

Merged
merged 3 commits into from
Feb 26, 2022

Conversation

just1900
Copy link
Contributor

@just1900 just1900 commented Feb 23, 2022

Signed-off-by: just1900 [email protected]

What problem does this PR solve?

K8s community and organizations are increasingly deploying multiple Kubernetes clusters to improve availability, isolation and scalability. Since TiDB Operator have support deploying tidb across-kubernetes, this PR will address the multi-k8s issue without affecting existing single-cluster use case.

Issue Number: close #4665

What is changed and how it works?

What's Changed:

  • add a k8s_cluster label in all expr
  • add k8s_cluster variable in Grafana templating

How it works:

  • For users with single-k8s, nothing need to be changed, just use it as before.
  • For users with multi-k8s:
    • first add kubernetes label to identify k8s cluster in your prometheus' external_labels.
    • set field "hide" to '0' to show variables in grafana via sed -i s/"hide": 2/"hide": 0/g <path/to/dashboard.json>
    • load it to grafana

Check List

Tests

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

Code changes

  • Has exported function/method change
  • Has exported variable/fields change
  • Has interface methods change
  • Has persistent data change

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation
  • Need to update key monitor metrics in both TiCDC document and official document

Release note

metrics: support multi-k8s in grafana dashboards

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Feb 23, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • overvenus

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 added do-not-merge/needs-linked-issue first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Feb 23, 2022
@CLAassistant
Copy link

CLAassistant commented Feb 23, 2022

CLA assistant check
All committers have signed the CLA.

@ti-chi-bot ti-chi-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 23, 2022
@codecov-commenter
Copy link

codecov-commenter commented Feb 23, 2022

Codecov Report

Merging #4658 (f7efafd) into master (9607554) will decrease coverage by 0.6668%.
The diff coverage is 39.8884%.

Flag Coverage Δ
cdc 59.4314% <43.3040%> (-0.4908%) ⬇️
dm 51.2449% <36.2105%> (-0.7840%) ⬇️

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

@@               Coverage Diff                @@
##             master      #4658        +/-   ##
================================================
- Coverage   55.6402%   54.9733%   -0.6669%     
================================================
  Files           494        512        +18     
  Lines         61283      63649      +2366     
================================================
+ Hits          34098      34990       +892     
- Misses        23750      25166      +1416     
- Partials       3435       3493        +58     

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 23, 2022
@overvenus overvenus added the component/metrics-logging Metrics and logging component. label Feb 23, 2022
@overvenus
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 6de8d26

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 23, 2022
@overvenus
Copy link
Member

/run-check-issue-triage-complete

@overvenus
Copy link
Member

/merge

@overvenus
Copy link
Member

/merge

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Feb 24, 2022
@overvenus
Copy link
Member

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2022
@ti-chi-bot ti-chi-bot removed the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Feb 25, 2022
@overvenus
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 821f680

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 25, 2022
@just1900 just1900 added needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. labels Feb 25, 2022
@just1900
Copy link
Contributor Author

/run-integration-test

@ti-chi-bot
Copy link
Member

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

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 merged commit d073614 into pingcap:master Feb 26, 2022
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Feb 26, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #4705.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Feb 26, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #4706.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Feb 26, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #4707.

@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #4708.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Feb 26, 2022
ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request Feb 26, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #4709.

@just1900 just1900 deleted the grafana-multi-k8s branch April 29, 2022 02:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/metrics-logging Metrics and logging component. first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. needs-cherry-pick-release-5.0 Should cherry pick this PR to release-5.0 branch. needs-cherry-pick-release-5.1 Should cherry pick this PR to release-5.1 branch. needs-cherry-pick-release-5.2 Should cherry pick this PR to release-5.2 branch. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. needs-cherry-pick-release-5.4 Should cherry pick this PR to release-5.4 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. require-LGT1 Indicates that the PR requires an LGTM. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT1 Indicates that a PR has LGTM 1.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

support multi-k8s in grafana dashboards
5 participants