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

Add docs about multi cluster prom monitoring #1490

Merged
merged 24 commits into from
Mar 21, 2022
Merged

Add docs about multi cluster prom monitoring #1490

merged 24 commits into from
Mar 21, 2022

Conversation

just1900
Copy link
Contributor

@just1900 just1900 commented Dec 15, 2021 •
edited by DanielZhangQD
Loading

What is changed, added, or deleted? (Required)

Fix pingcap/tidb-operator#3118
Add docs about multi cluster prom monitoring.

Which TiDB Operator version(s) do your changes apply to? (Required)

  • master (the latest development version)
  • v1.2 (TiDB Operator 1.2 versions)
  • v1.1 (TiDB Operator 1.1 versions)
  • v1.0 (TiDB Operator 1.0 versions)

What is the related PR or file link(s)?

  • This PR is translated from:
  • Other reference link(s):

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 15, 2021 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • csuzhangxc
  • ran-huang

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 the first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. label Dec 15, 2021
@ti-chi-bot ti-chi-bot requested a review from ran-huang December 15, 2021 01:55
@ti-chi-bot ti-chi-bot added missing-translation-status This PR does not have translation status info. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 15, 2021
@ran-huang ran-huang added the translation/doing This PR’s assignee is translating this PR. label Dec 15, 2021
@ran-huang ran-huang self-assigned this Dec 15, 2021
@ti-chi-bot ti-chi-bot removed the missing-translation-status This PR does not have translation status info. label Dec 15, 2021
csuzhangxc
csuzhangxc reviewed Dec 22, 2021
View reviewed changes
Copy link
Member

@csuzhangxc csuzhangxc left a comment

Choose a reason for hiding this comment

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

有一些中英文间的空格需要改一下

zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
@ran-huang
Copy link
Contributor

@just1900 please address comments, thanks!

@ti-chi-bot ti-chi-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 18, 2022
@just1900 just1900 force-pushed the docs-multi-cluster-prom-monitoring branch from a5fb63d to 2a1f9e6 Compare January 18, 2022 09:06
@ti-chi-bot ti-chi-bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 18, 2022
@just1900 just1900 force-pushed the docs-multi-cluster-prom-monitoring branch 2 times, most recently from 629e894 to 8788628 Compare January 18, 2022 09:15
@ran-huang ran-huang added needs-cherry-pick-release-1.2 needs-cherry-pick-release-1.3 Should cherry pick this PR to release-1.3 branch. labels Feb 11, 2022
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 14, 2022
@just1900 just1900 force-pushed the docs-multi-cluster-prom-monitoring branch from 2f0d863 to f476714 Compare February 14, 2022 10:33
@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 14, 2022
ran-huang
ran-huang reviewed Feb 15, 2022
View reviewed changes
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
zh/deploy-tidb-monitor-across-multiple-kubernetes.md Outdated Show resolved Hide resolved
@just1900 just1900 force-pushed the docs-multi-cluster-prom-monitoring branch 2 times, most recently from f020220 to 74d2120 Compare February 16, 2022 08:01
ran-huang
ran-huang reviewed Mar 18, 2022
View reviewed changes
zh/deploy-tidb-monitor-across-multiple-kubernetes.md
EOF
```

#### 配置 Federation Prometheus
Copy link
Contributor

Choose a reason for hiding this comment

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

  1. Federation Prometheus 需要部署吗？有的话部署步骤或者参考链接写一下
  2. “配置 Federation Prometheus” 和“部署 TiDB 集群监控”有先后顺序吗？

Copy link
Contributor Author

Choose a reason for hiding this comment

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

  1. 需要部署，部署方式就是部署 Prometheus，让用户参考https://prometheus.io/docs/prometheus/latest/federation/#hierarchical-federation 这个文档就可以，不需要在 tidb-operator 的 doc 里面再赘述了。
  2. 二者没有先后顺序。

@ran-huang
Copy link
Contributor

@just1900 调整了一些结构，PTAL edbf4ed

@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 Mar 21, 2022
@ran-huang
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: c21d578

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 21, 2022
@ti-chi-bot ti-chi-bot merged commit 968bada into pingcap:master Mar 21, 2022
ti-chi-bot pushed a commit to ti-chi-bot/docs-tidb-operator that referenced this pull request Mar 21, 2022
@just1900 @ti-chi-bot
Add docs about multi cluster prom monitoring (pingcap#1490)
cb7bacc
@ti-chi-bot ti-chi-bot mentioned this pull request Mar 21, 2022
Merged
8 tasks
@ti-chi-bot
Copy link
Member

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

ti-chi-bot pushed a commit to ti-chi-bot/docs-tidb-operator that referenced this pull request Mar 21, 2022
@just1900 @ti-chi-bot
This is an automated cherry-pick of pingcap#1490
91a4b75 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot
Copy link
Member

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

@ti-chi-bot ti-chi-bot mentioned this pull request Mar 21, 2022
Merged
8 tasks
ti-chi-bot added a commit that referenced this pull request Mar 21, 2022
@ti-chi-bot
Add docs about multi cluster prom monitoring (#1490) (#1768)
c50e27d
ti-chi-bot added a commit that referenced this pull request Mar 21, 2022
@ti-chi-bot
Add docs about multi cluster prom monitoring (#1490) (#1769)
3ed580f
@ran-huang ran-huang mentioned this pull request Apr 6, 2022
Merged
5 tasks
@ran-huang ran-huang removed the translation/doing This PR’s assignee is translating this PR. label Apr 8, 2022
@ti-chi-bot ti-chi-bot added the missing-translation-status This PR does not have translation status info. label Apr 8, 2022
@ran-huang ran-huang added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed missing-translation-status This PR does not have translation status info. labels Apr 8, 2022
This was referenced Sep 22, 2022
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ran-huang ran-huang ran-huang approved these changes

@DanielZhangQD DanielZhangQD DanielZhangQD left review comments

@csuzhangxc csuzhangxc csuzhangxc approved these changes

Assignees

@ran-huang ran-huang

Labels
first-time-contributor Indicates that the PR was contributed by an external member and is a first-time contributor. needs-cherry-pick-release-1.3 Should cherry pick this PR to release-1.3 branch. 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/LGT2 Indicates that a PR has LGTM 2. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Monitoring aggregation for the TidbClusters deployed across Kubernetes clusters
5 participants
@just1900 @ti-chi-bot @ran-huang @csuzhangxc @DanielZhangQD