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

Fix alert rules lost after rolling upgrade #2715

Merged
merged 3 commits into from
Jun 16, 2020

Conversation

weekface
Copy link
Contributor

What problem does this PR solve?

Part of: #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?:

Fix alert rules lost after rolling upgrade

@@ -67,7 +67,11 @@ spec:
- name: PROM_PERSISTENT_DIR
value: /data
- name: TIDB_VERSION
{{- if .Values.monitor.prometheus.alertManagerRulesVersion }}
value: tidb:{{ .Values.monitor.prometheus.alertManagerRulesVersion }}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Required format of TIDB_VERSION is tidb:vx.x.x.

@Yisaer
Copy link
Contributor

Yisaer commented Jun 15, 2020

Does TidbMonitor need this change?

@weekface
Copy link
Contributor Author

Does TidbMonitor need this change?

Yes. Another PR is coming soon which should only be cherry-picked to release-1.1.

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
Copy link
Contributor

Yisaer commented Jun 16, 2020

/merge

@ti-srebot
Copy link
Contributor

Your auto merge job has been accepted, waiting for:

  • 2654

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit abba4b1 into pingcap:master Jun 16, 2020
ti-srebot pushed a commit to ti-srebot/tidb-operator that referenced this pull request Jun 16, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-1.0 in PR #2728

ti-srebot pushed a commit to ti-srebot/tidb-operator that referenced this pull request Jun 16, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-1.1 in PR #2729

cofyc pushed a commit that referenced this pull request Jun 16, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: weekface <weekface@gmail.com>
ti-srebot added a commit that referenced this pull request Jun 16, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: weekface <weekface@gmail.com>
@weekface weekface deleted the fix-monitor-alert-rules branch June 19, 2020 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants