Skip to content

fix(crons): Fix variable reference for subtitle #53614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjo100 merged 2 commits into from
Jul 26, 2023
Merged

fix(crons): Fix variable reference for subtitle #53614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
342c786
fix(crons): Fix variable reference for subtitle
rjo100 Jul 26, 2023
ff4b0ce
fix variable
rjo100 Jul 26, 2023
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
4 changes: 2 additions & 2 deletions src/sentry/monitors/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,12 +650,12 @@ def get_occurrence_data(reason: str, **kwargs):
"subtitle": f"No check-in reported on {expected_time}.",
}
elif reason == MonitorFailure.DURATION:
timeout = kwargs.get("timeout", 30)
duration = kwargs.get("duration", 30)
return {
"group_type": MonitorCheckInTimeout,
"level": "error",
"reason": "duration",
"subtitle": f"Check-in exceeded maximum duration of {timeout} minutes.",
"subtitle": f"Check-in exceeded maximum duration of {duration} minutes.",
}

return {
Expand Down
12 changes: 8 additions & 4 deletions tests/sentry/monitors/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,11 @@ def test_mark_failed_with_reason_issue_platform(self, mock_produce_occurrence_to
organization_id=self.organization.id,
project_id=self.project.id,
type=MonitorType.CRON_JOB,
config={"schedule": [1, "month"], "schedule_type": ScheduleType.INTERVAL},
config={
"schedule": [1, "month"],
"schedule_type": ScheduleType.INTERVAL,
"max_runtime": 10,
},
)
monitor_environment = MonitorEnvironment.objects.create(
monitor=monitor,
Expand All @@ -411,7 +415,7 @@ def test_mark_failed_with_reason_issue_platform(self, mock_produce_occurrence_to
assert monitor_environment.mark_failed(
last_checkin=last_checkin,
reason=MonitorFailure.DURATION,
occurrence_context={"duration": 30},
occurrence_context={"duration": monitor.config.get("max_runtime")},
)

assert len(mock_produce_occurrence_to_kafka.mock_calls) == 1
Expand All @@ -425,7 +429,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": "Check-in exceeded maximum duration of 10 minutes.",
"resource_id": None,
"evidence_data": {},
"evidence_display": [
Expand Down Expand Up @@ -454,7 +458,7 @@ def test_mark_failed_with_reason_issue_platform(self, mock_produce_occurrence_to
"monitor": {
"status": "active",
"type": "cron_job",
"config": {"schedule_type": 2, "schedule": [1, "month"]},
"config": {"schedule_type": 2, "schedule": [1, "month"], "max_runtime": 10},
"id": str(monitor.guid),
"name": monitor.name,
"slug": monitor.slug,
Expand Down