From e93347e75ba635cebdf4ceb0a656e51b779f1006 Mon Sep 17 00:00:00 2001 From: Joey Orlando Date: Mon, 17 Apr 2023 19:30:31 +0200 Subject: [PATCH] temporarily disable is_restricted column + migration (#1765) --- .../alerts/migrations/0012_auto_20230406_1010.py | 13 +++++++------ engine/apps/alerts/models/alert_group.py | 6 +++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/engine/apps/alerts/migrations/0012_auto_20230406_1010.py b/engine/apps/alerts/migrations/0012_auto_20230406_1010.py index ad6ab411..666b5c49 100644 --- a/engine/apps/alerts/migrations/0012_auto_20230406_1010.py +++ b/engine/apps/alerts/migrations/0012_auto_20230406_1010.py @@ -10,14 +10,15 @@ class Migration(migrations.Migration): ] operations = [ - migrations.AddField( - model_name='alertgroup', - name='is_restricted', - field=models.BooleanField(default=False, null=True), - ), + # migrations.AddField( + # model_name='alertgroup', + # name='is_restricted', + # field=models.BooleanField(default=False, null=True), + # ), migrations.AlterField( model_name='alertgrouplogrecord', name='type', - field=models.IntegerField(choices=[(0, 'Acknowledged'), (1, 'Unacknowledged'), (2, 'Invite'), (3, 'Stop invitation'), (4, 'Re-invite'), (5, 'Escalation triggered'), (6, 'Invitation triggered'), (16, 'Escalation finished'), (7, 'Silenced'), (15, 'Unsilenced'), (8, 'Attached'), (9, 'Unattached'), (10, 'Custom button triggered'), (11, 'Unacknowledged by timeout'), (12, 'Failed attachment'), (13, 'Incident resolved'), (14, 'Incident unresolved'), (17, 'Escalation failed'), (18, 'Acknowledge reminder triggered'), (19, 'Wiped'), (20, 'Deleted'), (21, 'Incident registered'), (22, 'A route is assigned to the incident'), (23, 'Trigger direct paging escalation'), (24, 'Unpage a user'), (25, 'Restricted')]), + field=models.IntegerField(choices=[(0, 'Acknowledged'), (1, 'Unacknowledged'), (2, 'Invite'), (3, 'Stop invitation'), (4, 'Re-invite'), (5, 'Escalation triggered'), (6, 'Invitation triggered'), (16, 'Escalation finished'), (7, 'Silenced'), (15, 'Unsilenced'), (8, 'Attached'), (9, 'Unattached'), (10, 'Custom button triggered'), (11, 'Unacknowledged by timeout'), + (12, 'Failed attachment'), (13, 'Incident resolved'), (14, 'Incident unresolved'), (17, 'Escalation failed'), (18, 'Acknowledge reminder triggered'), (19, 'Wiped'), (20, 'Deleted'), (21, 'Incident registered'), (22, 'A route is assigned to the incident'), (23, 'Trigger direct paging escalation'), (24, 'Unpage a user'), (25, 'Restricted')]), ), ] diff --git a/engine/apps/alerts/models/alert_group.py b/engine/apps/alerts/models/alert_group.py index cdcba846..49c60498 100644 --- a/engine/apps/alerts/models/alert_group.py +++ b/engine/apps/alerts/models/alert_group.py @@ -352,7 +352,11 @@ class AlertGroup(AlertGroupSlackRenderingMixin, EscalationSnapshotMixin, models. # https://code.djangoproject.com/ticket/28545 is_open_for_grouping = models.BooleanField(default=None, null=True, blank=True) - is_restricted = models.BooleanField(default=False, null=True) + # is_restricted = models.BooleanField(default=False, null=True) + + @property + def is_restricted(self): + return False @staticmethod def get_silenced_state_filter():