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 alertMangerAlertVersion option to TidbMonitor #2744

Merged
merged 2 commits into from
Jun 17, 2020
Merged

Add alertMangerAlertVersion option to TidbMonitor #2744

merged 2 commits into from
Jun 17, 2020

Conversation

weekface
Copy link
Contributor

What problem does this PR solve?

fixes: #2710

What is changed and how does it work?

Check List

Tests

  • Unit test
  • E2E test
  • Stability test
  • Manual test (add detailed scripts or steps below)
  • No code

Code changes

  • Has Go code change
  • Has CI related scripts change
  • Has Terraform scripts change

Side effects

  • Breaking backward compatibility

Related changes

  • Need to cherry-pick to the release branch
  • Need to update the documentation

Does this PR introduce a user-facing change?:

Add alertMangerAlertVersion option to TidbMonitor

@Yisaer
Copy link
Contributor

Yisaer commented Jun 17, 2020

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit 29d8b07 into pingcap:master Jun 17, 2020
ti-srebot pushed a commit to ti-srebot/tidb-operator that referenced this pull request Jun 17, 2020
@weekface @ti-srebot
cherry pick pingcap#2744 to release-1.1
d66d76c 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jun 17, 2020
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-1.1 in PR #2748

ti-srebot added a commit that referenced this pull request Jun 17, 2020
@ti-srebot @weekface
Add alertMangerAlertVersion option to TidbMonitor (#2744) (#2748)
c2e6aa5 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: weekface <weekface@gmail.com>
@DanielZhangQD DanielZhangQD mentioned this pull request Jul 28, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cofyc cofyc cofyc approved these changes

@Yisaer Yisaer Yisaer approved these changes

@DanielZhangQD DanielZhangQD Awaiting requested review from DanielZhangQD

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

Successfully merging this pull request may close these issues.

Alert rules lost after rolling update tidb cluster
4 participants
@weekface @Yisaer @ti-srebot @cofyc