Skip to content

Bug 1850237: Delete subscription metric when an operator is uninstalled #1591

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
Merged
merged 1 commit into from
Aug 6, 2020
Merged

Bug 1850237: Delete subscription metric when an operator is uninstalled #1591

merged 1 commit into from
Aug 6, 2020

Conversation

anik120
Copy link
Contributor

@anik120 anik120 commented Jun 23, 2020

Description of the change:

When an operator was subscribed to using a Subscription Object,
the subscription_sync_total metric was emitted whenever the Subscription
Object was created/updated/deleted. This PR updates that behaviour to emit
the metric only when the Subscription object is created/updated, and deletes
the time series for that particular subscription when the subscription object
is deleted.

Motivation for the change:

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /docs
  • Commit messages sensible and descriptive

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Jun 23, 2020
@openshift-ci-robot
Copy link
Collaborator

@anik120: This pull request references Bugzilla bug 1850237, which is invalid:

  • expected the bug to target the "4.5.0" release, but it targets "4.5.z" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1850237: Delete subscription metric when an operator is uninstalled

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.

@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Jun 23, 2020
@anik120
Copy link
Contributor Author

anik120 commented Jun 23, 2020

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jun 23, 2020
@openshift-ci-robot
Copy link
Collaborator

@anik120: This pull request references Bugzilla bug 1850237, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1822396 is in the state ON_QA, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Bugzilla bug 1822396 targets the "4.6.0" release, which is one of the valid target releases: 4.6.0, 4.6.z
  • bug has dependents

In response to this:

/bugzilla refresh

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.

@anik120 anik120 force-pushed the sub_sync_metric_4.5 branch 3 times, most recently from 6b83f3f to 5e006a9 Compare June 25, 2020 06:59
@anik120
Copy link
Contributor Author

anik120 commented Jun 25, 2020

/retest

@anik120
Copy link
Contributor Author

anik120 commented Jun 25, 2020

/test e2e-aws-olm

@njhale
Copy link
Member

njhale commented Jun 29, 2020

/retest

5 similar comments
@anik120
Copy link
Contributor Author

anik120 commented Jun 29, 2020

/retest

@anik120
Copy link
Contributor Author

anik120 commented Jul 1, 2020

/retest

@anik120
Copy link
Contributor Author

anik120 commented Jul 6, 2020

/retest

@anik120
Copy link
Contributor Author

anik120 commented Jul 6, 2020

/retest

@anik120
Copy link
Contributor Author

anik120 commented Jul 7, 2020

/retest

@anik120
Bug 1850237: Delete subscription metric when an operator is uninstalled
c72bee4 
When an operator was subscribed to using a Subscription Object,
the subscription_sync_total metric was emitted whenever the Subscription
Object was created/updated/deleted. This PR updates that behaviour to emit
the metric only when the Subscription object is created/updated, and deletes
the time series for that particular subscription when the subscription object
is deleted.
@anik120 anik120 force-pushed the sub_sync_metric_4.5 branch from 5e006a9 to c72bee4 Compare July 7, 2020 14:05
@anik120
Copy link
Contributor Author

anik120 commented Jul 7, 2020

/retest

dinhxuanvu
dinhxuanvu approved these changes Jul 7, 2020
View reviewed changes
Copy link
Member

@dinhxuanvu dinhxuanvu left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 7, 2020
@kevinrizza
Copy link
Member

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anik120, dinhxuanvu, kevinrizza

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

The pull request process is described here

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 7, 2020
@sdodson sdodson added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Aug 6, 2020
@openshift-bot
Copy link
Contributor

/retest

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

4 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-merge-robot openshift-merge-robot merged commit 56976b6 into operator-framework:release-4.5 Aug 6, 2020
@openshift-ci-robot
Copy link
Collaborator

@anik120: All pull requests linked via external trackers have merged: operator-framework/operator-lifecycle-manager#1591. Bugzilla bug 1850237 has been moved to the MODIFIED state.

In response to this:

Bug 1850237: Delete subscription metric when an operator is uninstalled

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.

@benluddy
Copy link
Contributor

/cherry-pick release-4.4

@openshift-cherrypick-robot
Copy link

@benluddy: #1591 failed to apply on top of branch "release-4.4":

Applying: Bug 1850237: Delete subscription metric when an operator is uninstalled
Using index info to reconstruct a base tree...
M	pkg/controller/operators/catalog/subscription/syncer.go
M	pkg/controller/operators/catalog/subscription/syncer_test.go
M	pkg/metrics/metrics.go
M	test/e2e/metrics_e2e_test.go
M	test/e2e/subscription_e2e_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/subscription_e2e_test.go
CONFLICT (content): Merge conflict in test/e2e/subscription_e2e_test.go
Auto-merging test/e2e/metrics_e2e_test.go
CONFLICT (content): Merge conflict in test/e2e/metrics_e2e_test.go
Auto-merging pkg/metrics/metrics.go
CONFLICT (content): Merge conflict in pkg/metrics/metrics.go
Auto-merging pkg/controller/operators/catalog/subscription/syncer_test.go
Auto-merging pkg/controller/operators/catalog/subscription/syncer.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 Bug 1850237: Delete subscription metric when an operator is uninstalled
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".

In response to this:

/cherry-pick release-4.4

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
Reviewers

@dinhxuanvu dinhxuanvu dinhxuanvu approved these changes

@benluddy benluddy Awaiting requested review from benluddy

@exdx exdx Awaiting requested review from exdx

Assignees

@dinhxuanvu dinhxuanvu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@anik120 @openshift-ci-robot @njhale @kevinrizza @openshift-bot @benluddy @openshift-cherrypick-robot @dinhxuanvu @sdodson @openshift-merge-robot