Revert "feat(crons): Add helpful subtitle to crons issue platform + u…

…pdate evidence (#51877)"

This reverts commit b466fbc.

Co-authored-by: rjo100 <7078270+rjo100@users.noreply.github.com>

src/sentry/monitors/models.py

@@ -480,16 +480,7 @@ class Meta:
     def get_audit_log_data(self):
         return {"name": self.environment.name, "status": self.status, "monitor": self.monitor.name}
 
-    def get_last_successful_checkin(self):
-        return (
-            MonitorCheckIn.objects.filter(monitor_environment=self, status=CheckInStatus.OK)
-            .order_by("-date_added")
-            .first()
-        )
-
-    def mark_failed(
-        self, last_checkin=None, reason=MonitorFailure.UNKNOWN, occurrence_context=None
-    ):
+    def mark_failed(self, last_checkin=None, reason=MonitorFailure.UNKNOWN):
         from sentry.signals import monitor_environment_failed
 
         if last_checkin is None:
@@ -538,16 +529,7 @@ def mark_failed(
             from sentry.issues.issue_occurrence import IssueEvidence, IssueOccurrence
             from sentry.issues.producer import produce_occurrence_to_kafka
 
-            if not occurrence_context:
-                occurrence_context = {}
-
-            occurrence_data = get_occurrence_data(reason, **occurrence_context)
-
-            # Get last successful check-in to show in evidence display
-            last_successful_checkin_timestamp = "None"
-            last_successful_checkin = self.get_last_successful_checkin()
-            if last_successful_checkin:
-                last_successful_checkin_timestamp = last_successful_checkin.date_added.isoformat()
+            occurrence_data = get_occurrence_data(reason)
 
             occurrence = IssueOccurrence(
                 id=uuid.uuid4().hex,
@@ -559,16 +541,14 @@ def mark_failed(
                 ],
                 type=occurrence_data["group_type"],
                 issue_title=f"Monitor failure: {self.monitor.name}",
-                subtitle=occurrence_data["subtitle"],
+                subtitle="",
                 evidence_display=[
                     IssueEvidence(
                         name="Failure reason", value=occurrence_data["reason"], important=True
                     ),
                     IssueEvidence(name="Environment", value=self.environment.name, important=False),
                     IssueEvidence(
-                        name="Last successful check-in",
-                        value=last_successful_checkin_timestamp,
-                        important=False,
+                        name="Last check-in", value=last_checkin.isoformat(), important=False
                     ),
                 ],
                 evidence_data={},
@@ -633,30 +613,13 @@ def mark_ok(self, checkin: MonitorCheckIn, ts: datetime):
         MonitorEnvironment.objects.filter(id=self.id).exclude(last_checkin__gt=ts).update(**params)
 
 
-def get_occurrence_data(reason: str, **kwargs):
+def get_occurrence_data(reason: str):
     if reason == MonitorFailure.MISSED_CHECKIN:
-        expected_time = kwargs.get("expected_time", "the expected time")
-        return {
-            "group_type": MonitorCheckInMissed,
-            "level": "warning",
-            "reason": "missed_checkin",
-            "subtitle": f"No check-in reported at {expected_time}.",
-        }
+        return {"group_type": MonitorCheckInMissed, "level": "warning", "reason": "missed_checkin"}
     elif reason == MonitorFailure.DURATION:
-        timeout = kwargs.get("timeout", 30)
-        return {
-            "group_type": MonitorCheckInTimeout,
-            "level": "error",
-            "reason": "duration",
-            "subtitle": f"Check-in exceeded maximum duration of {timeout} minutes.",
-        }
+        return {"group_type": MonitorCheckInTimeout, "level": "error", "reason": "duration"}
 
-    return {
-        "group_type": MonitorCheckInFailure,
-        "level": "error",
-        "reason": "error",
-        "subtitle": "An error occurred during the last check-in.",
-    }
+    return {"group_type": MonitorCheckInFailure, "level": "error", "reason": "error"}
 
 
 @receiver(pre_save, sender=MonitorEnvironment)

src/sentry/monitors/tasks.py

@@ -88,10 +88,7 @@ def check_monitors(current_datetime=None):
                 expected_time=expected_time,
                 monitor_config=monitor.get_validated_config(),
             )
-            monitor_environment.mark_failed(
-                reason=MonitorFailure.MISSED_CHECKIN,
-                occurrence_context={"expected_time": expected_time},
-            )
+            monitor_environment.mark_failed(reason=MonitorFailure.MISSED_CHECKIN)
         except Exception:
             logger.exception("Exception in check_monitors - mark missed")
 
@@ -127,9 +124,6 @@ def check_monitors(current_datetime=None):
                 status__in=[CheckInStatus.OK, CheckInStatus.ERROR],
             ).exists()
             if not has_newer_result:
-                monitor_environment.mark_failed(
-                    reason=MonitorFailure.DURATION,
-                    occurrence_context={"duration": (timeout.seconds // 60) % 60},
-                )
+                monitor_environment.mark_failed(reason=MonitorFailure.DURATION)
         except Exception:
             logger.exception("Exception in check_monitors - mark timeout")

tests/sentry/monitors/test_models.py

@@ -13,9 +13,7 @@
     MonitorCheckInTimeout,
 )
 from sentry.monitors.models import (
-    CheckInStatus,
     Monitor,
-    MonitorCheckIn,
     MonitorEnvironment,
     MonitorEnvironmentLimitsExceeded,
     MonitorFailure,
@@ -316,13 +314,6 @@ def test_mark_failed_default_params_issue_platform(self, mock_produce_occurrence
             status=monitor.status,
         )
 
-        successful_check_in = MonitorCheckIn.objects.create(
-            monitor=monitor,
-            monitor_environment=monitor_environment,
-            project_id=self.project.id,
-            status=CheckInStatus.OK,
-        )
-
         last_checkin = timezone.now()
         assert monitor_environment.mark_failed(last_checkin=last_checkin)
 
@@ -337,7 +328,7 @@ def test_mark_failed_default_params_issue_platform(self, mock_produce_occurrence
                 "project_id": self.project.id,
                 "fingerprint": [hash_from_values(["monitor", str(monitor.guid), "error"])],
                 "issue_title": f"Monitor failure: {monitor.name}",
-                "subtitle": "An error occurred during the last check-in.",
+                "subtitle": "",
                 "resource_id": None,
                 "evidence_data": {},
                 "evidence_display": [
@@ -348,8 +339,8 @@ def test_mark_failed_default_params_issue_platform(self, mock_produce_occurrence
                         "important": False,
                     },
                     {
-                        "name": "Last successful check-in",
-                        "value": successful_check_in.date_added.isoformat(),
+                        "name": "Last check-in",
+                        "value": last_checkin.isoformat(),
                         "important": False,
                     },
                 ],
@@ -400,17 +391,9 @@ def test_mark_failed_with_reason_issue_platform(self, mock_produce_occurrence_to
             environment=self.environment,
             status=monitor.status,
         )
-        successful_check_in = MonitorCheckIn.objects.create(
-            monitor=monitor,
-            monitor_environment=monitor_environment,
-            project_id=self.project.id,
-            status=CheckInStatus.OK,
-        )
         last_checkin = timezone.now()
         assert monitor_environment.mark_failed(
-            last_checkin=last_checkin,
-            reason=MonitorFailure.DURATION,
-            occurrence_context={"duration": 30},
+            last_checkin=last_checkin, reason=MonitorFailure.DURATION
         )
 
         assert len(mock_produce_occurrence_to_kafka.mock_calls) == 1
@@ -424,7 +407,7 @@ def test_mark_failed_with_reason_issue_platform(self, mock_produce_occurrence_to
                 "project_id": self.project.id,
                 "fingerprint": [hash_from_values(["monitor", str(monitor.guid), "duration"])],
                 "issue_title": f"Monitor failure: {monitor.name}",
-                "subtitle": "Check-in exceeded maximum duration of 30 minutes.",
+                "subtitle": "",
                 "resource_id": None,
                 "evidence_data": {},
                 "evidence_display": [
@@ -435,8 +418,8 @@ def test_mark_failed_with_reason_issue_platform(self, mock_produce_occurrence_to
                         "important": False,
                     },
                     {
-                        "name": "Last successful check-in",
-                        "value": successful_check_in.date_added.isoformat(),
+                        "name": "Last check-in",
+                        "value": last_checkin.isoformat(),
                         "important": False,
                     },
                 ],
@@ -488,11 +471,8 @@ def test_mark_failed_with_missed_reason_issue_platform(self, mock_produce_occurr
             status=monitor.status,
         )
         last_checkin = timezone.now()
-        expected_time = monitor.get_next_scheduled_checkin_without_margin(last_checkin)
         assert monitor_environment.mark_failed(
-            last_checkin=last_checkin,
-            reason=MonitorFailure.MISSED_CHECKIN,
-            occurrence_context={"expected_time": expected_time},
+            last_checkin=last_checkin, reason=MonitorFailure.MISSED_CHECKIN
         )
 
         monitor.refresh_from_db()
@@ -510,7 +490,7 @@ def test_mark_failed_with_missed_reason_issue_platform(self, mock_produce_occurr
                 "project_id": self.project.id,
                 "fingerprint": [hash_from_values(["monitor", str(monitor.guid), "missed_checkin"])],
                 "issue_title": f"Monitor failure: {monitor.name}",
-                "subtitle": f"No check-in reported at {expected_time}.",
+                "subtitle": "",
                 "resource_id": None,
                 "evidence_data": {},
                 "evidence_display": [
@@ -521,8 +501,8 @@ def test_mark_failed_with_missed_reason_issue_platform(self, mock_produce_occurr
                         "important": False,
                     },
                     {
-                        "name": "Last successful check-in",
-                        "value": "None",
+                        "name": "Last check-in",
+                        "value": last_checkin.isoformat(),
                         "important": False,
                     },
                 ],