From 82410429b4dd396bb9afb735204ae3f4bc9029b3 Mon Sep 17 00:00:00 2001 From: Joey Orlando Date: Mon, 19 Aug 2024 19:10:46 -0400 Subject: [PATCH] remove leftofter/deprecated slack log report tasks (#4858) # What this PR does Follow up to https://github.com/grafana/oncall/pull/4686 ## Checklist - [x] Unit, integration, and e2e (if applicable) tests updated - [x] Documentation added (or `pr:no public docs` PR label added if not required) - [x] Added the relevant release notes label (see labels prefixed w/ `release:`). These labels dictate how your PR will show up in the autogenerated release notes. --- ...move_alertgroup_slack_log_message_state.py | 18 +++++++++++++++++ engine/apps/alerts/models/alert_group.py | 8 -------- ..._remove_alertgroup_slack_log_message_db.py | 20 +++++++++++++++++++ .../alert_group_representative.py | 7 ------- engine/apps/slack/tasks.py | 7 ------- engine/settings/celery_task_routes.py | 3 --- 6 files changed, 38 insertions(+), 25 deletions(-) create mode 100644 engine/apps/alerts/migrations/0056_remove_alertgroup_slack_log_message_state.py create mode 100644 engine/apps/alerts/move_to_migrations_folder_soon_0057_remove_alertgroup_slack_log_message_db.py diff --git a/engine/apps/alerts/migrations/0056_remove_alertgroup_slack_log_message_state.py b/engine/apps/alerts/migrations/0056_remove_alertgroup_slack_log_message_state.py new file mode 100644 index 00000000..157cbfc5 --- /dev/null +++ b/engine/apps/alerts/migrations/0056_remove_alertgroup_slack_log_message_state.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.15 on 2024-08-19 21:54 + +import common.migrations.remove_field +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('alerts', '0055_alter_bundlednotification_alert_group'), + ] + + operations = [ + common.migrations.remove_field.RemoveFieldState( + model_name='AlertGroup', + name='slack_log_message', + ), + ] diff --git a/engine/apps/alerts/models/alert_group.py b/engine/apps/alerts/models/alert_group.py index 49fa6325..4f30e47d 100644 --- a/engine/apps/alerts/models/alert_group.py +++ b/engine/apps/alerts/models/alert_group.py @@ -395,14 +395,6 @@ class AlertGroup(AlertGroupSlackRenderingMixin, EscalationSnapshotMixin, models. related_name="wiped_alert_groups", ) - # TODO: drop this column in future release - slack_log_message = models.OneToOneField( - "slack.SlackMessage", - on_delete=models.SET_NULL, - null=True, - default=None, - ) - prevent_posting_alerts = models.BooleanField(default=False) maintenance_uuid = models.CharField(max_length=100, unique=True, null=True, default=None) diff --git a/engine/apps/alerts/move_to_migrations_folder_soon_0057_remove_alertgroup_slack_log_message_db.py b/engine/apps/alerts/move_to_migrations_folder_soon_0057_remove_alertgroup_slack_log_message_db.py new file mode 100644 index 00000000..c9e75254 --- /dev/null +++ b/engine/apps/alerts/move_to_migrations_folder_soon_0057_remove_alertgroup_slack_log_message_db.py @@ -0,0 +1,20 @@ +# Generated by Django 4.2.15 on 2024-08-19 21:54 + +from django.db import migrations + +import common.migrations.remove_field + + +class Migration(migrations.Migration): + + dependencies = [ + ('alerts', '0056_remove_alertgroup_slack_log_message_state'), + ] + + operations = [ + common.migrations.remove_field.RemoveFieldDB( + model_name='AlertGroup', + name='slack_log_message', + remove_state_migration=('alerts', '0056_remove_alertgroup_slack_log_message_state'), + ), + ] diff --git a/engine/apps/slack/representatives/alert_group_representative.py b/engine/apps/slack/representatives/alert_group_representative.py index 88884943..431153e0 100644 --- a/engine/apps/slack/representatives/alert_group_representative.py +++ b/engine/apps/slack/representatives/alert_group_representative.py @@ -86,13 +86,6 @@ def on_alert_group_action_triggered_async(log_record_id): logger.debug(f"Finish on_alert_group_action_triggered for alert_group {alert_group_id}, log record {log_record_id}") -@shared_dedicated_queue_retry_task( - autoretry_for=(Exception,), retry_backoff=True, max_retries=1 if settings.DEBUG else None -) -def on_alert_group_update_log_report_async(alert_group_id): - return "Deprecated, will be removed after queue cleanup" - - class AlertGroupSlackRepresentative(AlertGroupAbstractRepresentative): def __init__(self, log_record): self.log_record = log_record diff --git a/engine/apps/slack/tasks.py b/engine/apps/slack/tasks.py index 4575d86f..5831f84e 100644 --- a/engine/apps/slack/tasks.py +++ b/engine/apps/slack/tasks.py @@ -284,13 +284,6 @@ def populate_slack_user_identities(organization_pk): SlackUserIdentity.objects.bulk_update(slack_user_identities_to_update, fields_to_update, batch_size=5000) -@shared_dedicated_queue_retry_task( - autoretry_for=(Exception,), retry_backoff=True, max_retries=1 if settings.DEBUG else None -) -def post_or_update_log_report_message_task(alert_group_pk, slack_team_identity_pk, update=False): - return "Deprecated, will be removed after queue cleanup" - - @shared_dedicated_queue_retry_task( autoretry_for=(Exception,), retry_backoff=True, max_retries=1 if settings.DEBUG else None ) diff --git a/engine/settings/celery_task_routes.py b/engine/settings/celery_task_routes.py index 1eccac6c..eb28e9d5 100644 --- a/engine/settings/celery_task_routes.py +++ b/engine/settings/celery_task_routes.py @@ -174,9 +174,6 @@ CELERY_TASK_ROUTES = { "queue": "slack" }, "apps.slack.representatives.alert_group_representative.on_alert_group_action_triggered_async": {"queue": "slack"}, - # TODO: remove post_or_update_log_report_message_task and on_alert_group_update_log_report_async in subsequent PR - "apps.slack.tasks.post_or_update_log_report_message_task": {"queue": "slack"}, - "apps.slack.representatives.alert_group_representative.on_alert_group_update_log_report_async": {"queue": "slack"}, # TELEGRAM "apps.telegram.tasks.edit_message": {"queue": "telegram"}, "apps.telegram.tasks.on_create_alert_telegram_representative_async": {"queue": "telegram"},