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

config: correct the explanation of status and metrics. (#13024) #16179

Merged
merged 4 commits into from
Apr 13, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 8, 2020

cherry-pick #13024 to release-2.1


What problem does this PR solve?

The explanation of metrics-addr and status-port is not so accurate.
status-port copied metrics-addr explanation which is a mistake, need to remove it.
metrics-addr leaves empty will disable the push to Pushgateway, rather than Prometheus push.

What is changed and how it works?

  • Delete the mistake explanation for status-port
  • Add HTTP API example for status-host and status-port
  • Correct the explanation for metrics-addr

Check List

Tests

  • No code

Related changes

  • Need to cherry-pick to the release branch

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 8, 2020

/run-all-tests

@@ -128,13 +128,22 @@ cluster-ssl-key = ""
# If enable status report HTTP service.
report-status = true

<<<<<<< HEAD
=======
Copy link
Contributor

Choose a reason for hiding this comment

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

Please fix the conflicts. @ericsyh

Copy link
Contributor

@AilinKid AilinKid left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@zimulala zimulala left a comment

Choose a reason for hiding this comment

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

LGTM

@zimulala zimulala added the status/can-merge Indicates a PR has been approved by a committer. label Apr 13, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 13, 2020

Your auto merge job has been accepted, waiting for 16309

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 13, 2020

/run-all-tests

@sre-bot sre-bot merged commit 9526a7c into pingcap:release-2.1 Apr 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/config status/can-merge Indicates a PR has been approved by a committer. type/2.1-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants