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 tiflash into prometheus rules in TidbMonitor #2341

Merged
merged 12 commits into from
Apr 30, 2020
Merged

Add tiflash into prometheus rules in TidbMonitor #2341

merged 12 commits into from
Apr 30, 2020

Conversation

Yisaer
Copy link
Contributor

@Yisaer Yisaer commented Apr 29, 2020 •
edited by DanielZhangQD
Loading

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`

@Yisaer Yisaer requested review from weekface, DanielZhangQD and cofyc and removed request for weekface April 29, 2020 09:19
@Yisaer Yisaer added the area/monitor monitoring label Apr 29, 2020
DanielZhangQD
DanielZhangQD reviewed Apr 29, 2020
View reviewed changes
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.

Rest LGTM

pkg/controller/controller_utils.go Outdated Show resolved Hide resolved
DanielZhangQD
DanielZhangQD previously approved these changes Apr 29, 2020
View reviewed changes
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 DanielZhangQD mentioned this pull request Apr 29, 2020
Closed
@Yisaer Yisaer requested a review from DanielZhangQD April 29, 2020 10:25
DanielZhangQD
DanielZhangQD approved these changes Apr 29, 2020
View reviewed changes
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 DanielZhangQD mentioned this pull request Apr 29, 2020
Closed
13 tasks
@cofyc cofyc mentioned this pull request Apr 29, 2020
Closed
4 tasks
@DanielZhangQD
Copy link
Contributor

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Apr 30, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Apr 30, 2020

/run-all-tests

@DanielZhangQD DanielZhangQD merged commit fb2f465 into pingcap:master Apr 30, 2020
@sre-bot sre-bot mentioned this pull request Apr 30, 2020
Merged
@sre-bot
Copy link
Contributor

sre-bot commented Apr 30, 2020

cherry pick to release-1.1 in PR #2357

cofyc pushed a commit that referenced this pull request Apr 30, 2020
@sre-bot
Add tiflash into prometheus rules in TidbMonitor (#2341) (#2357)
9d383ac 
* revise template

* support tiflash proxy metrics

* add tiflash rules

* fix unit test

* fix note

* fix test

Co-authored-by: Song Gao <2695690803@qq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DanielZhangQD DanielZhangQD DanielZhangQD approved these changes

@weekface weekface weekface approved these changes

@cofyc cofyc Awaiting requested review from cofyc

Assignees
No one assigned
Labels
area/monitor monitoring CanMerge needs-cherry-pick-1.1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support monitoring for TiFlash
4 participants
@Yisaer @DanielZhangQD @sre-bot @weekface