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

chore: refine monitor-related api #7279

Merged
merged 25 commits into from
May 10, 2024
Merged

chore: refine monitor-related api #7279

merged 25 commits into from
May 10, 2024

Conversation

sophon-zt
Copy link
Contributor

No description provided.

@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines. label May 9, 2024
@sophon-zt sophon-zt force-pushed the support/improvement-refine-monitor-related-api-issue7238 branch from f1af322 to 6184188 Compare May 9, 2024 03:24
@codecov Codecov
Copy link

codecov bot commented May 9, 2024 •
edited

Codecov Report

Attention: Patch coverage is 57.92683% with 138 lines in your changes are missing coverage. Please review.

Project coverage is 64.83%. Comparing base (99fabb0) to head (5e6176a).
Report is 10 commits behind head on main.

Files Patch % Lines
pkg/common/monitor.go 0.00% 29 Missing ⚠️
...ps/transformer_component_prometheus_integration.go 78.40% 14 Missing and 5 partials ⚠️
.../apps/transformer_component_monitor_transformer.go 48.14% 12 Missing and 2 partials ⚠️
pkg/controller/component/component.go 13.33% 13 Missing ⚠️
apis/apps/v1alpha1/cluster_types.go 0.00% 12 Missing ⚠️
apis/apps/v1alpha1/configconstraint_conversion.go 0.00% 11 Missing ⚠️
pkg/controller/factory/builder.go 8.33% 11 Missing ⚠️
controllers/apps/monitor_integration_utils.go 76.74% 8 Missing and 2 partials ⚠️
apis/apps/v1beta1/meta.go 0.00% 6 Missing ⚠️
pkg/controller/builder/builder_monitor_service.go 76.00% 4 Missing and 2 partials ⚠️
... and 3 more
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #7279      +/-   ##
==========================================
- Coverage   64.83%   64.83%   -0.01%     
==========================================
  Files         345      349       +4     
  Lines       42156    42284     +128     
==========================================
+ Hits        27331    27413      +82     
- Misses      12441    12468      +27     
- Partials     2384     2403      +19
Flag Coverage Δ
unittests 64.83% <57.92%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sophon-zt sophon-zt marked this pull request as ready for review May 9, 2024 14:48
@sophon-zt sophon-zt requested review from leon-inf and weicao May 9, 2024 14:48
@sophon-zt sophon-zt mentioned this pull request May 10, 2024
Closed
@apecloud-bot apecloud-bot added the approved PR Approved Test label May 10, 2024
@sophon-zt
Copy link
Contributor Author

/approve

@sophon-zt sophon-zt merged commit a4d36c1 into main May 10, 2024
54 checks passed
@sophon-zt sophon-zt deleted the support/improvement-refine-monitor-related-api-issue7238 branch May 10, 2024 13:33
@github-actions github-actions bot added this to the Release 0.9.0 milestone May 10, 2024
@sophon-zt sophon-zt linked an issue May 10, 2024 that may be closed by this pull request
[Features] Support servicemonitor of prometheus operator, which defines how to scrape metrics #7301
Open
@sophon-zt
Copy link
Contributor Author

/cherry-pick release-0.9

@github-actions GitHub Actions
Copy link

🤖 says: Error cherry-picking.

Auto-merging apis/apps/v1alpha1/cluster_types.go
Auto-merging apis/apps/v1alpha1/component_types.go
Auto-merging apis/apps/v1alpha1/componentdefinition_types.go
Auto-merging apis/apps/v1alpha1/type.go
Auto-merging apis/apps/v1alpha1/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in apis/apps/v1alpha1/zz_generated.deepcopy.go
Auto-merging cmd/manager/main.go
Auto-merging config/crd/bases/apps.kubeblocks.io_clusterdefinitions.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_clusters.yaml
CONFLICT (content): Merge conflict in config/crd/bases/apps.kubeblocks.io_clusters.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_componentdefinitions.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_components.yaml
Auto-merging controllers/apps/component_controller.go
Auto-merging controllers/apps/component_controller_test.go
Auto-merging controllers/apps/suite_test.go
Auto-merging controllers/apps/transformer_cluster_component.go
Auto-merging deploy/helm/crds/apps.kubeblocks.io_clusterdefinitions.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_clusters.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/apps.kubeblocks.io_clusters.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_componentdefinitions.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_components.yaml
Auto-merging docs/developer_docs/api-reference/cluster.md
CONFLICT (content): Merge conflict in docs/developer_docs/api-reference/cluster.md
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
Auto-merging pkg/controller/builder/builder_component.go
Auto-merging pkg/controller/component/component.go
CONFLICT (content): Merge conflict in pkg/controller/component/component.go
Auto-merging pkg/controller/component/component_definition_convertor.go
Auto-merging pkg/controller/component/synthesize_component.go
CONFLICT (content): Merge conflict in pkg/controller/component/synthesize_component.go
Auto-merging pkg/controller/component/type.go
Auto-merging pkg/controller/factory/builder.go
Auto-merging pkg/generics/type.go
Auto-merging pkg/testutil/apps/cluster_factory.go
Auto-merging pkg/testutil/apps/constant.go
error: could not apply a4d36c1... chore: refine monitor-related api (#7279)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

@github-actions GitHub Actions
Copy link

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kubeblocks/actions/runs/9042831326

sophon-zt added a commit that referenced this pull request May 11, 2024
@sophon-zt
chore: refine monitor-related api (#7279)
3095d3a 
(cherry picked from commit a4d36c1)
@sophon-zt sophon-zt linked an issue May 13, 2024 that may be closed by this pull request
[BUG] addon enable failed: unknown field "monitor" in ClusterDefinition on k8s 1.22 #7261
Closed
wangyelei pushed a commit that referenced this pull request May 14, 2024
@sophon-zt @wangyelei
chore: refine monitor-related api (#7279)
081ffd1
@sophon-zt sophon-zt linked an issue May 27, 2024 that may be closed by this pull request
[Improvement] Refine monitor-related API #7238
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weicao weicao weicao approved these changes

@apecloud-bot apecloud-bot apecloud-bot approved these changes

@nayutah nayutah Awaiting requested review from nayutah nayutah is a code owner

@ldming ldming Awaiting requested review from ldming ldming is a code owner

@heng4fun heng4fun Awaiting requested review from heng4fun heng4fun is a code owner

@free6om free6om Awaiting requested review from free6om free6om is a code owner

@wangyelei wangyelei Awaiting requested review from wangyelei wangyelei is a code owner

@Y-Rookie Y-Rookie Awaiting requested review from Y-Rookie Y-Rookie is a code owner

@leon-inf leon-inf Awaiting requested review from leon-inf

Assignees
No one assigned
Labels
approved PR Approved Test size/XXL Denotes a PR that changes 1000+ lines.
Projects
None yet
Milestone
Release 0.9.0
3 participants
@sophon-zt @weicao @apecloud-bot