diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py index 9c50dac4414a65..05109df762ac1f 100644 --- a/src/sentry/conf/server.py +++ b/src/sentry/conf/server.py @@ -1321,8 +1321,6 @@ def SOCIAL_AUTH_DEFAULT_USERNAME() -> str: # Enable creating organizations within sentry (if SENTRY_SINGLE_ORGANIZATION # is not enabled). "organizations:create": True, - # Use issue platform for crons issues - "organizations:crons-issue-platform": False, # Use new listing page for crons "organizations:crons-timeline-listing-page": False, # Enable usage of customer domains on the frontend diff --git a/src/sentry/features/__init__.py b/src/sentry/features/__init__.py index 8133cb9a33fb76..ca9576e195bc4f 100644 --- a/src/sentry/features/__init__.py +++ b/src/sentry/features/__init__.py @@ -71,7 +71,6 @@ default_manager.add("organizations:auto-enable-codecov", OrganizationFeature, FeatureHandlerStrategy.INTERNAL) default_manager.add("organizations:crash-rate-alerts", OrganizationFeature, FeatureHandlerStrategy.INTERNAL) default_manager.add("organizations:mute-metric-alerts", OrganizationFeature, FeatureHandlerStrategy.INTERNAL) -default_manager.add("organizations:crons-issue-platform", OrganizationFeature, FeatureHandlerStrategy.INTERNAL) default_manager.add("organizations:crons-timeline-listing-page", OrganizationFeature, FeatureHandlerStrategy.REMOTE) default_manager.add("organizations:customer-domains", OrganizationFeature, FeatureHandlerStrategy.REMOTE) default_manager.add("organizations:dashboards-mep", OrganizationFeature, FeatureHandlerStrategy.REMOTE) diff --git a/src/sentry/monitors/models.py b/src/sentry/monitors/models.py index 1e2fbd01a5e1d9..7a79ad5d805619 100644 --- a/src/sentry/monitors/models.py +++ b/src/sentry/monitors/models.py @@ -517,7 +517,7 @@ def mark_failed(self, last_checkin=None, reason=MonitorFailure.UNKNOWN): organization = Organization.objects.get(id=self.monitor.organization_id) use_issue_platform = features.has( "organizations:issue-platform", organization=organization - ) and features.has("organizations:crons-issue-platform", organization=organization) + ) except Organization.DoesNotExist: pass diff --git a/tests/sentry/monitors/test_models.py b/tests/sentry/monitors/test_models.py index a32f2088b38028..17901145fa25a5 100644 --- a/tests/sentry/monitors/test_models.py +++ b/tests/sentry/monitors/test_models.py @@ -159,7 +159,7 @@ def test_monitor_organization_limit(self): @region_silo_test(stable=True) class MonitorEnvironmentTestCase(TestCase): - @with_feature({"organizations:crons-issue-platform": False}) + @with_feature({"organizations:issue-platform": False}) @patch("sentry.coreapi.insert_data_to_database_legacy") def test_mark_failed_default_params_legacy(self, mock_insert_data_to_database_legacy): monitor = Monitor.objects.create( @@ -204,7 +204,7 @@ def test_mark_failed_default_params_legacy(self, mock_insert_data_to_database_le }, ) == dict(event) - @with_feature({"organizations:crons-issue-platform": False}) + @with_feature({"organizations:issue-platform": False}) @patch("sentry.coreapi.insert_data_to_database_legacy") def test_mark_failed_with_reason_legacy(self, mock_insert_data_to_database_legacy): monitor = Monitor.objects.create( @@ -249,7 +249,7 @@ def test_mark_failed_with_reason_legacy(self, mock_insert_data_to_database_legac }, ) == dict(event) - @with_feature({"organizations:crons-issue-platform": False}) + @with_feature({"organizations:issue-platform": False}) @patch("sentry.coreapi.insert_data_to_database_legacy") def test_mark_failed_with_missed_reason_legacy(self, mock_insert_data_to_database_legacy): monitor = Monitor.objects.create( @@ -298,7 +298,7 @@ def test_mark_failed_with_missed_reason_legacy(self, mock_insert_data_to_databas }, ) == dict(event) - @with_feature(["organizations:issue-platform", "organizations:crons-issue-platform"]) + @with_feature("organizations:issue-platform") @patch("sentry.issues.producer.produce_occurrence_to_kafka") def test_mark_failed_default_params_issue_platform(self, mock_produce_occurrence_to_kafka): monitor = Monitor.objects.create( @@ -376,7 +376,7 @@ def test_mark_failed_default_params_issue_platform(self, mock_produce_occurrence }, ) == dict(event) - @with_feature(["organizations:issue-platform", "organizations:crons-issue-platform"]) + @with_feature("organizations:issue-platform") @patch("sentry.issues.producer.produce_occurrence_to_kafka") def test_mark_failed_with_reason_issue_platform(self, mock_produce_occurrence_to_kafka): monitor = Monitor.objects.create( @@ -455,7 +455,7 @@ def test_mark_failed_with_reason_issue_platform(self, mock_produce_occurrence_to }, ) == dict(event) - @with_feature(["organizations:issue-platform", "organizations:crons-issue-platform"]) + @with_feature("organizations:issue-platform") @patch("sentry.issues.producer.produce_occurrence_to_kafka") def test_mark_failed_with_missed_reason_issue_platform(self, mock_produce_occurrence_to_kafka): monitor = Monitor.objects.create(