Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion migrations_lockfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ remote_subscriptions: 0003_drop_remote_subscription

replays: 0004_index_together

sentry: 0860_add_new_groupopenperiod_constraint
sentry: 0861_monitors_remove_location

social_auth: 0002_default_auto_field

Expand Down
3 changes: 2 additions & 1 deletion src/sentry/db/router.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ class SiloRouter:
"authprovider_duplicate": SiloMode.CONTROL,
"authidentity_duplicate": SiloMode.CONTROL,
"sentry_alertruleactivations": SiloMode.REGION,
"sentry_monitorlocation": SiloMode.REGION,
}
"""
When we remove models, we are no longer able to resolve silo assignments
Expand Down Expand Up @@ -218,9 +219,9 @@ class TestSiloMultiDatabaseRouter(SiloRouter):
secondary_db_models = {
"sentry_monitor",
"sentry_monitorcheckin",
"sentry_monitorlocation",
"sentry_monitorenvironment",
"sentry_monitorincident",
"sentry_monitorlocation",
"sentry_monitorenvbrokendetection",
}

Expand Down
29 changes: 29 additions & 0 deletions src/sentry/migrations/0861_monitors_remove_location.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Generated by Django 5.1.7 on 2025-04-01 20:43

from sentry.new_migrations.migrations import CheckedMigration
from sentry.new_migrations.monkey.models import SafeDeleteModel
from sentry.new_migrations.monkey.state import DeletionAction


class Migration(CheckedMigration):
# This flag is used to mark that a migration shouldn't be automatically run in production.
# This should only be used for operations where it's safe to run the migration after your
# code has deployed. So this should not be used for most operations that alter the schema
# of a table.
# Here are some things that make sense to mark as post deployment:
# - Large data migrations. Typically we want these to be run manually so that they can be
# monitored and not block the deploy for a long period of time while they run.
# - Adding indexes to large tables. Since this can take a long time, we'd generally prefer to
# run this outside deployments so that we don't block them. Note that while adding an index
# is a schema change, it's completely safe to run the operation after the code has deployed.
# Once deployed, run these manually via: https://develop.sentry.dev/database-migrations/#migration-deployment

is_post_deployment = False

dependencies = [
("sentry", "0860_add_new_groupopenperiod_constraint"),
]

operations = [
SafeDeleteModel(name="MonitorLocation", deletion_action=DeletionAction.MOVE_TO_PENDING)
]
16 changes: 0 additions & 16 deletions src/sentry/monitors/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -580,22 +580,6 @@ def _update_timestamps(self):
pass


@region_silo_model
class MonitorLocation(Model):
__relocation_scope__ = RelocationScope.Excluded

guid = UUIDField(unique=True, auto_add=True)
name = models.CharField(max_length=128)
date_added = models.DateTimeField(default=timezone.now)
objects: ClassVar[BaseManager[Self]] = BaseManager(cache_fields=("guid",))

class Meta:
app_label = "sentry"
db_table = "sentry_monitorlocation"

__repr__ = sane_repr("guid", "name")


class MonitorEnvironmentManager(BaseManager["MonitorEnvironment"]):
"""
A manager that consolidates logic for monitor environment updates
Expand Down
Loading