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 (#4099) #4206

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #4099

Signed-off-by: just1900 [email protected]

What problem does this PR solve?

Issue Number: ref #4129

Problem Summary:

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.

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

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

metrics: support multi-k8s in grafana dashboards

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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 release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 9, 2022
@ti-chi-bot ti-chi-bot added the type/cherry-pick-for-release-5.4 This PR is cherry-picked to release-5.4 from a source PR. label Mar 9, 2022
@@ -4739,7 +4739,11 @@
"steppedLine": false,
"targets": [
{
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

conflict

Comment on lines +1804 to +1805
<<<<<<< HEAD
=======
Copy link
Contributor

Choose a reason for hiding this comment

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

conflict

Copy link
Contributor

Choose a reason for hiding this comment

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

working on it

@JaySon-Huang JaySon-Huang added this to the v5.4.1 milestone Apr 21, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 25, 2022
@JaySon-Huang
Copy link
Contributor

Resolve conflict in #4213

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. type/cherry-pick-for-release-5.4 This PR is cherry-picked to release-5.4 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants