ref(crons): Remove Monitor type field (state) (#88496)

Co-authored-by: getsantry[bot] <66042841+getsantry[bot]@users.noreply.github.com>

Author: 2 people

migrations_lockfile.txt

@@ -17,7 +17,7 @@ remote_subscriptions: 0003_drop_remote_subscription
 
 replays: 0004_index_together
 
-sentry: 0855_give_monitor_type_a_db_default
+sentry: 0856_monitors_remove_type_column_state
 
 social_auth: 0002_default_auto_field
 

src/sentry/migrations/0856_monitors_remove_type_column_state.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.1.7 on 2025-04-01 20:02
+
+from sentry.new_migrations.migrations import CheckedMigration
+from sentry.new_migrations.monkey.fields import SafeRemoveField
+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", "0855_give_monitor_type_a_db_default"),
+    ]
+
+    operations = [
+        SafeRemoveField(
+            model_name="monitor", name="type", deletion_action=DeletionAction.MOVE_TO_PENDING
+        ),
+    ]

src/sentry/monitors/clock_tasks/check_missed.py

@@ -9,13 +9,7 @@
 
 from sentry.constants import ObjectStatus
 from sentry.monitors.logic.mark_failed import mark_failed
-from sentry.monitors.models import (
-    CheckInStatus,
-    MonitorCheckIn,
-    MonitorEnvironment,
-    MonitorStatus,
-    MonitorType,
-)
+from sentry.monitors.models import CheckInStatus, MonitorCheckIn, MonitorEnvironment, MonitorStatus
 from sentry.monitors.schedule import get_prev_schedule
 from sentry.utils import metrics
 
@@ -58,9 +52,10 @@ def dispatch_check_missing(ts: datetime):
     missed_envs = list(
         MonitorEnvironment.objects.filter(
             IGNORE_MONITORS,
-            monitor__type__in=[MonitorType.CRON_JOB],
             next_checkin_latest__lte=ts,
-        ).values("id")[:MONITOR_LIMIT]
+        ).values(
+            "id"
+        )[:MONITOR_LIMIT]
     )
 
     metrics.gauge(

src/sentry/monitors/consumers/monitor_consumer.py

@@ -40,7 +40,6 @@
     MonitorEnvironmentLimitsExceeded,
     MonitorEnvironmentValidationFailed,
     MonitorLimitsExceeded,
-    MonitorType,
 )
 from sentry.monitors.processing_errors.errors import (
     CheckinEnvironmentMismatch,
@@ -154,7 +153,6 @@ def _ensure_monitor_with_config(
             defaults={
                 "name": monitor_slug,
                 "status": ObjectStatus.ACTIVE,
-                "type": MonitorType.CRON_JOB,
                 "config": validated_config,
                 "owner_user_id": owner_user_id,
                 "owner_team_id": owner_team_id,

src/sentry/monitors/endpoints/base_monitor_details.py

@@ -69,7 +69,6 @@ def update_monitor(
                 "name": monitor.name,
                 "slug": monitor.slug,
                 "status": monitor.status,
-                "type": monitor.type,
                 "config": monitor.config,
                 "project": project,
             },

src/sentry/monitors/endpoints/organization_monitor_index.py

@@ -41,7 +41,6 @@
     MonitorEnvironment,
     MonitorLimitsExceeded,
     MonitorStatus,
-    MonitorType,
 )
 from sentry.monitors.serializers import (
     MonitorBulkEditResponse,
@@ -233,13 +232,6 @@ def get(self, request: AuthenticatedHttpRequest, organization: Organization) ->
                         )
                     except ValueError:
                         queryset = queryset.none()
-                elif key == "type":
-                    try:
-                        queryset = queryset.filter(
-                            type__in=map_value_to_constant(MonitorType, value)
-                        )
-                    except ValueError:
-                        queryset = queryset.none()
                 else:
                     queryset = queryset.none()
 
@@ -294,7 +286,6 @@ def post(self, request: AuthenticatedHttpRequest, organization) -> Response:
                 name=result["name"],
                 slug=result.get("slug"),
                 status=result["status"],
-                type=result["type"],
                 config=result["config"],
             )
         except MonitorLimitsExceeded as e:

src/sentry/monitors/logic/incident_occurrence.py

@@ -265,7 +265,6 @@ def get_monitor_environment_context(monitor_environment: MonitorEnvironment):
         "name": monitor_environment.monitor.name,
         "config": monitor_environment.monitor.config,
         "status": monitor_environment.get_status_display(),
-        "type": monitor_environment.monitor.get_type_display(),
     }
 
 

src/sentry/monitors/models.py

@@ -190,26 +190,6 @@ def as_choices(cls):
 )
 
 
-class MonitorType:
-    # In the future we may have other types of monitors such as health check
-    # monitors. But for now we just have CRON_JOB style monitors.
-    UNKNOWN = 0
-    CRON_JOB = 3
-    UPTIME = 4
-
-    @classmethod
-    def as_choices(cls):
-        return (
-            (cls.UNKNOWN, "unknown"),
-            (cls.CRON_JOB, "cron_job"),
-            (cls.UPTIME, "uptime"),
-        )
-
-    @classmethod
-    def get_name(cls, value):
-        return dict(cls.as_choices())[value]
-
-
 class ScheduleType:
     UNKNOWN = 0
     CRONTAB = 1
@@ -263,14 +243,6 @@ class Monitor(Model):
     Human readable name of the monitor. Used for display purposes.
     """
 
-    type = BoundedPositiveIntegerField(
-        db_default=MonitorType.UNKNOWN,
-        choices=[(k, str(v)) for k, v in MonitorType.as_choices()],
-    )
-    """
-    Type of monitor. Currently there are only CRON_JOB monitors.
-    """
-
     owner_user_id = HybridCloudForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete="SET_NULL")
     """
     The user assigned as the owner of this model.
@@ -346,7 +318,6 @@ def get_schedule_type_display(self):
     def get_audit_log_data(self):
         return {
             "name": self.name,
-            "type": self.type,
             "status": self.status,
             "config": self.config,
             "is_muted": self.is_muted,

src/sentry/monitors/validators.py

@@ -19,13 +19,11 @@
 from sentry.db.models import BoundedPositiveIntegerField
 from sentry.db.models.fields.slug import DEFAULT_SLUG_MAX_LENGTH
 from sentry.monitors.constants import MAX_THRESHOLD, MAX_TIMEOUT
-from sentry.monitors.models import CheckInStatus, Monitor, MonitorType, ScheduleType
+from sentry.monitors.models import CheckInStatus, Monitor, ScheduleType
 from sentry.monitors.schedule import get_next_schedule, get_prev_schedule
 from sentry.monitors.types import CrontabSchedule
 from sentry.utils.dates import AVAILABLE_TIMEZONES
 
-MONITOR_TYPES = {"cron_job": MonitorType.CRON_JOB}
-
 MONITOR_STATUSES = {
     "active": ObjectStatus.ACTIVE,
     "disabled": ObjectStatus.DISABLED,
@@ -274,11 +272,6 @@ class MonitorValidator(CamelSnakeSerializer):
         required=False,
         help_text="Disable creation of monitor incidents",
     )
-    type = serializers.ChoiceField(
-        choices=list(zip(MONITOR_TYPES.keys(), MONITOR_TYPES.keys())),
-        required=False,
-        default="cron_job",
-    )
     config = ConfigValidator(help_text="The configuration for the monitor.")
     alert_rule = MonitorAlertRuleValidator(required=False)
 
@@ -299,9 +292,6 @@ def validate_status(self, value):
 
         return status
 
-    def validate_type(self, value):
-        return MONITOR_TYPES.get(value, value)
-
     def validate_slug(self, value):
         # Ignore if slug is equal to current value
         if not value or (self.instance and value == self.instance.get("slug")):

src/sentry/testutils/cases.py

@@ -106,7 +106,7 @@
 from sentry.models.releasecommit import ReleaseCommit
 from sentry.models.repository import Repository
 from sentry.models.rule import RuleSource
-from sentry.monitors.models import Monitor, MonitorEnvironment, MonitorType, ScheduleType
+from sentry.monitors.models import Monitor, MonitorEnvironment, ScheduleType
 from sentry.new_migrations.monkey.state import SentryProjectState
 from sentry.notifications.models.notificationsettingoption import NotificationSettingOption
 from sentry.notifications.models.notificationsettingprovider import NotificationSettingProvider
@@ -3120,7 +3120,6 @@ def _create_monitor(self, **kwargs):
         return Monitor.objects.create(
             organization_id=self.organization.id,
             project_id=self.project.id,
-            type=MonitorType.CRON_JOB,
             config={
                 "schedule": "* * * * *",
                 "schedule_type": ScheduleType.CRONTAB,

src/sentry/testutils/fixtures.py

@@ -30,7 +30,6 @@
     MonitorCheckIn,
     MonitorEnvironment,
     MonitorIncident,
-    MonitorType,
     ScheduleType,
 )
 from sentry.organizations.services.organization import RpcOrganization
@@ -459,7 +458,6 @@ def create_monitor(self, **kwargs):
         return Monitor.objects.create(
             organization_id=self.organization.id,
             project_id=project_id,
-            type=MonitorType.CRON_JOB,
             config={
                 "schedule": "* * * * *",
                 "schedule_type": ScheduleType.CRONTAB,

src/sentry/testutils/helpers/backups.py

@@ -92,7 +92,7 @@
 from sentry.models.rule import NeglectedRule, RuleActivity, RuleActivityType
 from sentry.models.savedsearch import SavedSearch, Visibility
 from sentry.models.search_common import SearchType
-from sentry.monitors.models import Monitor, MonitorType, ScheduleType
+from sentry.monitors.models import Monitor, ScheduleType
 from sentry.nodestore.django.models import Node
 from sentry.sentry_apps.logic import SentryAppUpdater
 from sentry.sentry_apps.models.sentry_app import SentryApp
@@ -502,7 +502,6 @@ def create_exhaustive_organization(
         Monitor.objects.create(
             organization_id=project.organization.id,
             project_id=project.id,
-            type=MonitorType.CRON_JOB,
             config={"schedule": "* * * * *", "schedule_type": ScheduleType.CRONTAB},
             owner_user_id=owner_id,
         )

src/sentry/utils/mockdata/core.py

@@ -59,7 +59,6 @@
     MonitorCheckIn,
     MonitorEnvironment,
     MonitorStatus,
-    MonitorType,
 )
 from sentry.services.organization import organization_provisioning_service
 from sentry.signals import mocks_loaded
@@ -432,7 +431,6 @@ def create_monitor(project: Project, environment: Environment) -> None:
         name=next(MONITOR_NAMES),
         project_id=project.id,
         organization_id=project.organization_id,
-        type=MonitorType.CRON_JOB,
         defaults={
             "status": ObjectStatus.DISABLED,
             "config": {"schedule": next(MONITOR_SCHEDULES)},

tests/acceptance/test_organization_monitors.py

@@ -9,7 +9,6 @@
     MonitorCheckIn,
     MonitorEnvironment,
     MonitorStatus,
-    MonitorType,
     ScheduleType,
 )
 from sentry.testutils.cases import AcceptanceTestCase
@@ -85,7 +84,6 @@ def test_list_monitors(self):
         monitor = Monitor.objects.create(
             organization_id=self.organization.id,
             project_id=self.project.id,
-            type=MonitorType.CRON_JOB,
             name="My Monitor",
             config={
                 "schedule": "0 0 * * *",
@@ -124,7 +122,6 @@ def test_edit_monitor(self):
         Monitor.objects.create(
             organization_id=self.organization.id,
             project_id=self.project.id,
-            type=MonitorType.CRON_JOB,
             name="My Monitor",
             config={
                 "schedule": "0 0 * * *",

tests/sentry/deletions/test_monitor.py

@@ -6,7 +6,6 @@
     Monitor,
     MonitorCheckIn,
     MonitorEnvironment,
-    MonitorType,
     ScheduleType,
 )
 from sentry.testutils.cases import APITestCase, TransactionTestCase
@@ -21,7 +20,6 @@ def test_simple(self):
         monitor = Monitor.objects.create(
             organization_id=project.organization.id,
             project_id=project.id,
-            type=MonitorType.CRON_JOB,
             config={"schedule": "* * * * *", "schedule_type": ScheduleType.CRONTAB},
         )
         monitor_env = MonitorEnvironment.objects.create(

tests/sentry/deletions/test_monitor_environment.py

@@ -6,7 +6,6 @@
     Monitor,
     MonitorCheckIn,
     MonitorEnvironment,
-    MonitorType,
     ScheduleType,
 )
 from sentry.testutils.cases import APITestCase, TransactionTestCase
@@ -22,7 +21,6 @@ def test_simple(self):
         monitor = Monitor.objects.create(
             organization_id=project.organization.id,
             project_id=project.id,
-            type=MonitorType.CRON_JOB,
             config={"schedule": "* * * * *", "schedule_type": ScheduleType.CRONTAB},
         )
         monitor_env = MonitorEnvironment.objects.create(

tests/sentry/deletions/test_project.py

@@ -23,7 +23,6 @@
     Monitor,
     MonitorCheckIn,
     MonitorEnvironment,
-    MonitorType,
     ScheduleType,
 )
 from sentry.sentry_apps.models.servicehook import ServiceHook
@@ -95,7 +94,6 @@ def test_simple(self):
         monitor = Monitor.objects.create(
             organization_id=project.organization.id,
             project_id=project.id,
-            type=MonitorType.CRON_JOB,
             config={"schedule": "* * * * *", "schedule_type": ScheduleType.CRONTAB},
         )
         monitor_env = MonitorEnvironment.objects.create(

tests/sentry/deletions/test_team.py

@@ -3,7 +3,7 @@
 from sentry.models.projectteam import ProjectTeam
 from sentry.models.rule import Rule
 from sentry.models.team import Team
-from sentry.monitors.models import Monitor, MonitorType
+from sentry.monitors.models import Monitor
 from sentry.testutils.cases import TestCase
 from sentry.testutils.hybrid_cloud import HybridCloudTestMixin
 from sentry.types.actor import Actor
@@ -55,7 +55,6 @@ def test_monitor_blanking(self):
         monitor = Monitor.objects.create(
             organization_id=self.organization.id,
             project_id=self.project.id,
-            type=MonitorType.CRON_JOB,
             name="My Awesome Monitor",
             owner_team_id=team.id,
         )