Fix Slack acknowledgment reminders #2769
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vstpme
commented
Aug 10, 2023
Comment on lines
-333
to
-335
| # NOTE: we should probably migrate this field to models.UUIDField as it's ONLY ever being | ||
| # set to the result of uuid.uuid1 | ||
| last_unique_unacknowledge_process_id: UUID | None = models.CharField(max_length=100, null=True, default=None) |
There was a problem hiding this comment.
last_unique_unacknowledge_process_id should be a string, so removing these type annotations and comments
| @@ -1599,28 +1594,20 @@ def bulk_silence(user: User, alert_groups: "QuerySet[AlertGroup]", silence_delay | |||
| AlertGroup._bulk_silence(user, root_alert_groups_to_silence, silence_delay) | |||
| AlertGroup._bulk_silence(user, dependent_alert_groups_to_silence, silence_delay) | |||
|
|
|||
| def start_ack_reminder(self, user: User): | |||
There was a problem hiding this comment.
user was only used for logging, so removing it from the args
| if not countdown: | ||
| return | ||
|
|
||
| self.last_unique_unacknowledge_process_id = celery_uuid() |
There was a problem hiding this comment.
The main change of the PR: instead of using uuid1 to generate Celery task IDs, use celery.uuid.
The method stopped working after we upgraded to kombu 5.3.0 (a transitive dependency of celery). Previously, when UUID objects were passed to Celery tasks as arguments, they were converted to str and it was safe to compare it with strings. After upgrading to kombu 5.3.0, UUIDs are passed to tasks as UUID type, thus comparing them with strings always returns False.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does
Fixes a bug with Slack acknowledgment reminders not being sent (+ some refactoring and unit tests).
Which issue(s) this PR fixes
#2756
Checklist
pr:no public docsPR label added if not required)CHANGELOG.mdupdated (orpr:no changelogPR label added if not required)