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 TidbMonitor ClusterRef missing error in prometheus rule #2746

Merged
merged 3 commits into from
Jun 18, 2020
Merged

Fix TidbMonitor ClusterRef missing error in prometheus rule #2746

merged 3 commits into from
Jun 18, 2020

Conversation

Yisaer
Copy link
Contributor

@Yisaer Yisaer commented Jun 17, 2020 •
edited
Loading

What problem does this PR solve?

Currently the TidbMonitor default Namespace strategy won't take effect to the prometheus rule which would cause one TidbMonitor scrape multi tidbclusters with the same name in different namespaces.

ref #2742

Related changes

  • Need to cherry-pick to the release branch

Does this PR introduce a user-facing change?:

Fix the bug TidbMonitor will scrape multi TidbCluster with same same in different namespace when then namespace in ClusterRef not set.

@Yisaer Yisaer added the area/monitor monitoring label Jun 17, 2020
DanielZhangQD
DanielZhangQD approved these changes Jun 18, 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 requested a review from zjj2wry June 18, 2020 03:44
zjj2wry
zjj2wry approved these changes Jun 18, 2020
View reviewed changes
Copy link
Contributor

@zjj2wry zjj2wry 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 Author

Yisaer commented Jun 18, 2020

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit 9293610 into pingcap:master Jun 18, 2020
ti-srebot pushed a commit to ti-srebot/tidb-operator that referenced this pull request Jun 18, 2020
@Yisaer @ti-srebot
cherry pick pingcap#2746 to release-1.1
3e50783 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jun 18, 2020
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-1.1 in PR #2766

ti-srebot added a commit that referenced this pull request Jun 18, 2020
@ti-srebot @Yisaer
Fix TidbMonitor ClusterRef missing error in prometheus rule (#2746) (#…
a710b21 
…2766)

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

Co-authored-by: Song Gao <disxiaofei@163.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

@zjj2wry zjj2wry zjj2wry approved these changes

@weekface weekface Awaiting requested review from weekface

@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.
4 participants
@Yisaer @ti-srebot @zjj2wry @DanielZhangQD