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

Support NG Monitoring #4287

Merged
merged 37 commits into from Dec 13, 2021
Merged

Support NG Monitoring #4287

merged 37 commits into from Dec 13, 2021

Conversation

KanShiori
Copy link
Collaborator

@KanShiori KanShiori commented Dec 2, 2021

What problem does this PR solve?

What is changed and how does it work?

Code changes

  • Has Go code change
  • Has CI related scripts change

Tests

  • Unit test

  • E2E test

  • Manual test

  • No code

Side effects

  • Breaking backward compatibility
  • Other side effects:

Related changes

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

Release Notes

Please refer to Release Notes Language Style Guide before writing the release note.

Support to deploy TiDBNGMonitoring

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Dec 2, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • DanielZhangQD
  • csuzhangxc

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@codecov-commenter
Copy link

codecov-commenter commented Dec 2, 2021

Codecov Report

Merging #4287 (f1a38b6) into master (8cc59c1) will increase coverage by 3.43%.
The diff coverage is 24.64%.

@@            Coverage Diff             @@
##           master    #4287      +/-   ##
==========================================
+ Coverage   61.61%   65.05%   +3.43%     
==========================================
  Files         182      194      +12     
  Lines       19653    22529    +2876     
==========================================
+ Hits        12110    14657    +2547     
- Misses       6367     6603     +236     
- Partials     1176     1269      +93     
Flag Coverage Δ
e2e 42.32% <20.28%> (?)
unittest 60.25% <16.31%> (-1.37%) ⬇️

@KanShiori KanShiori marked this pull request as ready for review December 3, 2021 11:37
@KanShiori KanShiori changed the title (WIP) Support NG Monitoring Support NG Monitoring Dec 3, 2021
@@ -74,30 +73,6 @@ func annotationsMountVolume() (corev1.VolumeMount, corev1.Volume) {
return m, v
}

// statefulSetIsUpgrading confirms whether the statefulSet is upgrading phase
func statefulSetIsUpgrading(set *apps.StatefulSet) bool {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

move some function to a public pkg pkg/manager/utils in order to reuse

@KanShiori
Copy link
Collaborator Author

/test pull-e2e-kind-br

# Conflicts:
#	pkg/manager/member/tikv_upgrader.go
pkg/apis/pingcap/v1alpha1/crd_kinds.go Outdated Show resolved Hide resolved
pkg/apis/pingcap/v1alpha1/tidbngmonitoring_types.go Outdated Show resolved Hide resolved
pkg/manager/tidbngmonitoring/ng_monitoring_manager.go Outdated Show resolved Hide resolved
pkg/manager/tidbngmonitoring/ng_monitoring_manager.go Outdated Show resolved Hide resolved
# Conflicts:
#	pkg/apis/pingcap/v1alpha1/openapi_generated.go
@KanShiori
Copy link
Collaborator Author

/test pull-e2e-kind

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

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 72cc593

@KanShiori
Copy link
Collaborator Author

/test pull-e2e-kind

# Conflicts:
#	pkg/manager/member/tikv_upgrader.go
@DanielZhangQD
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: f1a38b6

@KanShiori
Copy link
Collaborator Author

/test pull-e2e-kind

@KanShiori
Copy link
Collaborator Author

/test pull-e2e-kind-across-kubernetes

@ti-chi-bot ti-chi-bot merged commit 346a330 into pingcap:master Dec 13, 2021
@KanShiori KanShiori deleted the ng_monitor_cr branch December 14, 2021 09:25
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.

None yet

5 participants