Skip to content

feat(leaky-bucket): handle disabled org integrations#30459

Merged
scefali merged 10 commits into
masterfrom
feat/handle-disabled-org-integrations
Dec 7, 2021
Merged

feat(leaky-bucket): handle disabled org integrations#30459
scefali merged 10 commits into
masterfrom
feat/handle-disabled-org-integrations

Conversation

@scefali

@scefali scefali commented Dec 6, 2021

Copy link
Copy Markdown
Contributor

This is a new attempt to merge this PR: #30339 which resulted in an outage (SENTRY-SWS). The commit to fix the issue: 2f0d95a

This PR adds logic to make sure we don't allow users to pick a disabled integration (or org integration) for metric alerts and issue alerts. Additionally, it ensures we don't send issue alerts, metric alerts, or notifications for those disabled integrations. This is being done to make sure when we set the OrganizationIntegration status to disabled for Slack, alerting and notification get properly disabled.

Note, I am purposely not propagating this change for other integration features such as stack trace linking, issue syncing, etc. Since it seems the leaky bucket only impacts alert rule integrations, making those changes isn't strictly necessary to ensure functionality (and could add risk to this PR). Perhaps in a follow-up PR we might extend these checks there.

@scefali scefali marked this pull request as ready for review December 6, 2021 22:44
@scefali scefali requested a review from a team as a code owner December 6, 2021 22:44
@scefali scefali requested review from a team and wedamija December 6, 2021 22:44
@scefali

scefali commented Dec 6, 2021

Copy link
Copy Markdown
Contributor Author

Need to adjust how the query works

@scefali scefali closed this Dec 6, 2021
@scefali scefali reopened this Dec 6, 2021

@wedamija wedamija left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

lgtm, I just quickly validated that your new test fails without the changes and succeeds with.

@scefali scefali merged commit 333d3c7 into master Dec 7, 2021
@scefali scefali deleted the feat/handle-disabled-org-integrations branch December 7, 2021 18:29
scefali pushed a commit that referenced this pull request Dec 7, 2021
@github-actions github-actions Bot locked and limited conversation to collaborators Dec 23, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants