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

Fix AlertManager setting error (#2108) #2109

Merged
merged 3 commits into from
Apr 6, 2020
Merged

Fix AlertManager setting error (#2108) #2109

merged 3 commits into from
Apr 6, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 2, 2020 •
edited by cofyc
Loading

cherry-pick #2108 to release-1.1

What problem does this PR solve?

Fix AlertManager setting error

Related changes

  • Need to cherry-pick to the release branch

Does this PR introduce a user-facing change?:

Fix the error that alertmanager couldn't be set in `TidbMonitor`

@sre-bot sre-bot mentioned this pull request Apr 2, 2020
Merged
@sre-bot sre-bot added area/monitor monitoring type/1.1-cherry-pick type/bug Something isn't working labels Apr 2, 2020
DanielZhangQD
DanielZhangQD approved these changes Apr 2, 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

@Yisaer Yisaer merged commit 5e3409e into pingcap:release-1.1 Apr 6, 2020
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

@cofyc cofyc Awaiting requested review from cofyc

@qiffang qiffang Awaiting requested review from qiffang

@zyxbest zyxbest Awaiting requested review from zyxbest

Assignees
No one assigned
Labels
area/monitor monitoring type/bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sre-bot @DanielZhangQD @Yisaer