Skip to content

rename metrics-exporter spec to monitoring#1098

Merged
openshift-merge-robot merged 1 commit intored-hat-storage:masterfrom
umangachapagain:monitoring
Mar 12, 2021
Merged

rename metrics-exporter spec to monitoring#1098
openshift-merge-robot merged 1 commit intored-hat-storage:masterfrom
umangachapagain:monitoring

Conversation

@umangachapagain
Copy link
Copy Markdown
Contributor

Monitoring spec is more generic and suited to our use case
as we configure more than just a metrics-exporter.

We want monitoring to be fully enabled or fully disabled.
i.e. metrics-exporter, PrometheusRule, ServiceMonitor etc
should all be managed via common parent spec.

It will also enable future enhancements under "monitoring"
without making any breaking changes.

Signed-off-by: Umanga Chapagain chapagainumanga@gmail.com

Monitoring spec is more generic and suited to our use case
as we configure more than just a metrics-exporter.

We want monitoring to be fully enabled or fully disabled.
i.e. metrics-exporter, PrometheusRule, ServiceMonitor etc
should all be managed via common parent spec.

Signed-off-by: Umanga Chapagain <chapagainumanga@gmail.com>
@umangachapagain umangachapagain requested a review from jarrpa March 1, 2021 07:34
@umangachapagain umangachapagain removed the request for review from davidvossel March 1, 2021 08:22
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 2, 2021
Copy link
Copy Markdown
Member

@jarrpa jarrpa left a comment

Choose a reason for hiding this comment

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

100% agree.

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2021
@openshift-ci-robot
Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jarrpa

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

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-bot
Copy link
Copy Markdown

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Copy Markdown

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 0184e52 into red-hat-storage:master Mar 12, 2021
@agarwal-mudit
Copy link
Copy Markdown
Member

/cherry-pick release-4.7

@openshift-cherrypick-robot
Copy link
Copy Markdown

@agarwal-mudit: #1098 failed to apply on top of branch "release-4.7":

Applying: rename metrics-exporter spec to monitoring
Using index info to reconstruct a base tree...
M	api/v1/storagecluster_types.go
M	api/v1/zz_generated.deepcopy.go
M	config/crd/bases/ocs.openshift.io_storageclusters.yaml
M	controllers/storagecluster/reconcile.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/storagecluster/reconcile.go
CONFLICT (content): Merge conflict in controllers/storagecluster/reconcile.go
Auto-merging config/crd/bases/ocs.openshift.io_storageclusters.yaml
Auto-merging api/v1/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in api/v1/zz_generated.deepcopy.go
Auto-merging api/v1/storagecluster_types.go
CONFLICT (content): Merge conflict in api/v1/storagecluster_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 rename metrics-exporter spec to monitoring
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-4.7

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants