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

Add tiflash into prometheus rules in TidbMonitor (#2341) #2357

Merged
merged 7 commits into from
Apr 30, 2020

Conversation

sre-bot
Copy link
Contributor

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

cherry-pick #2341 to release-1.1


What problem does this PR solve? <!--add and issue link with summary if exists--

Fix #2082
Support TiFlash metrics in TidbMonitor. In Tiflash, we have 2 metrics endpoint, tiflash-core and tiflash-proxy.

522D0D63443CEFE89207D0F14B051A11

Related changes

  • Need to cherry-pick to the release branch

Does this PR introduce a user-facing change?:

Support `TiFlash` metrics in `TidbMonitor`

Copy link
Contributor

@DanielZhangQD DanielZhangQD left a comment

Choose a reason for hiding this comment

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

LGTM

@DanielZhangQD
Copy link
Contributor

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

Your auto merge job has been accepted, waiting for:

  • 2337

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

/run-all-tests

@cofyc cofyc merged commit 9d383ac into pingcap:release-1.1 Apr 30, 2020
@cofyc cofyc mentioned this pull request Apr 30, 2020
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants