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 3 monitoring documents #2791

Merged
merged 8 commits into from
Jun 17, 2020
Merged

add 3 monitoring documents #2791

merged 8 commits into from
Jun 17, 2020

Conversation

TomShawn
Copy link
Contributor

@TomShawn TomShawn commented Jun 11, 2020 •
edited
Loading

What is changed, added or deleted? (Required)

Create monitor-deploy.md and tidb-monitoring-api.md

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

  • master (the latest development version)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

If you select two or more versions from above, to trigger the bot to cherry-pick this PR to your desired release version branch(es), you must add corresponding labels such as needs-cherry-pick-4.0, needs-cherry-pick-3.1, needs-cherry-pick-3.0, and needs-cherry-pick-2.1.

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

@TomShawn TomShawn added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. needs-cherry-pick-4.0 special-week PR from Document Special Week. labels Jun 11, 2020
@TomShawn TomShawn changed the title add 2 monitoring documents add 3 monitoring documents Jun 11, 2020
@yikeke yikeke requested a review from lilin90 June 11, 2020 10:04
@yikeke
Copy link
Contributor

yikeke commented Jun 11, 2020

Please help review this PR~ @lilin90

lilin90
lilin90 reviewed Jun 12, 2020
View reviewed changes
deploy-monitoring-services.md Outdated Show resolved Hide resolved
deploy-monitoring-services.md Outdated Show resolved Hide resolved
deploy-monitoring-services.md Outdated Show resolved Hide resolved
deploy-monitoring-services.md Outdated Show resolved Hide resolved
production-deployment-from-binary-tarball.md Outdated Show resolved Hide resolved
tidb-monitoring-api.md Outdated

- TiDB API address: `http://${host}:${port}`
- Default port: `10080`
- Details about API names: see [TiDB HTTP API](https://github.com/pingcap/tidb/blob/master/docs/tidb_http_api.md)
Copy link
Member

Choose a reason for hiding this comment

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

Could you provide the source of this line? Because I didn't see it on the Chinese dev version.

tidb-monitoring-framework.md Outdated Show resolved Hide resolved
tidb-monitoring-framework.md Outdated Show resolved Hide resolved
tidb-monitoring-framework.md Outdated Show resolved Hide resolved
tidb-monitoring-framework.md Outdated Show resolved Hide resolved
@lilin90 lilin90 added the status/require-change Needs the author to address comments. label Jun 12, 2020
@TomShawn
Copy link
Contributor Author

@lilin90 All comments are addressed, PTAL again, thanks!

@sre-bot
Copy link
Contributor

sre-bot commented Jun 14, 2020

@TomShawn, please update your pull request.

@TomShawn TomShawn added status/PTAL This PR is ready for reviewing. and removed status/require-change Needs the author to address comments. labels Jun 15, 2020
@yikeke yikeke added the requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. label Jun 16, 2020
@yikeke yikeke removed their request for review June 16, 2020 09:48
lilin90
lilin90 approved these changes Jun 16, 2020
View reviewed changes
Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

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

LGTM

@lilin90 lilin90 added the status/require-change Needs the author to address comments. label Jun 16, 2020
@lilin90
Copy link
Member

lilin90 commented Jun 16, 2020

@TomShawn Please resolve the conflict.

@ti-srebot
Copy link
Contributor

@TomShawn, please update your pull request.

@TomShawn
Copy link
Contributor Author

@lilin90 Conflict resolved, PTAL again, thanks!

lilin90
lilin90 reviewed Jun 17, 2020
View reviewed changes
Copy link
Member

@lilin90 lilin90 left a comment

Choose a reason for hiding this comment

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

LGTM

@lilin90 lilin90 merged commit 81d016b into pingcap:master Jun 17, 2020
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Jun 17, 2020
@TomShawn @ti-srebot
cherry pick pingcap#2791 to release-4.0
61e238f 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request Jun 17, 2020
Merged
5 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #2917

TomShawn added a commit that referenced this pull request Jun 17, 2020
@ti-srebot @TomShawn
cherry pick #2791 to release-4.0 (#2917)
d12b1bf 
Signed-off-by: ti-srebot <[email protected]>

Co-authored-by: TomShawn <[email protected]>
@TomShawn TomShawn deleted the Create-monitor-deploy.md-and-tidb-monitoring-api.md branch June 17, 2020 03:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lilin90 lilin90 lilin90 approved these changes

@xiaoyangwang5 xiaoyangwang5 Awaiting requested review from xiaoyangwang5

Assignees
No one assigned
Labels
requires-version-specific-changes After cherry-picked, the cherry-picked PR requires further changes. special-week PR from Document Special Week. status/PTAL This PR is ready for reviewing. status/require-change Needs the author to address comments. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@TomShawn @yikeke @sre-bot @lilin90 @ti-srebot