From a3be0cc2a3794fa3eb48fb09cea5b00e63fc40cf Mon Sep 17 00:00:00 2001
From: syasonik <syasonik@gitlab.com>
Date: Tue, 23 Jul 2024 17:22:30 -0400
Subject: [PATCH] Remove references to unused prometheus alert on incoming
alerts payloads
The Metrics Dashboard (used for monitoring apps deploying using gitlab)
was deprecated in 14.7 and removed from the product in 16.0.
This commit cleans up a portion of the dead code.
https://gitlab.com/groups/gitlab-org/-/epics/10107
---
lib/gitlab/alert_management/payload/base.rb | 4 ----
spec/lib/gitlab/alert_management/payload/base_spec.rb | 2 --
2 files changed, 6 deletions(-)
diff --git a/lib/gitlab/alert_management/payload/base.rb b/lib/gitlab/alert_management/payload/base.rb
index 529b76061177..a0d984436a3e 100644
--- a/lib/gitlab/alert_management/payload/base.rb
+++ b/lib/gitlab/alert_management/payload/base.rb
@@ -26,13 +26,10 @@ class Base
:environment_name,
:full_query,
:generator_url,
- :gitlab_alert,
:gitlab_fingerprint,
- :gitlab_prometheus_alert_id,
:gitlab_y_label,
:has_required_attributes?,
:hosts,
- :metric_id,
:monitoring_tool,
:resolved?,
:runbook,
@@ -111,7 +108,6 @@ def alert_params
monitoring_tool: truncate(monitoring_tool, ::AlertManagement::Alert::TOOL_MAX_LENGTH),
payload: payload,
project_id: project.id,
- prometheus_alert: gitlab_alert,
service: truncate(service, ::AlertManagement::Alert::SERVICE_MAX_LENGTH),
severity: severity,
started_at: starts_at,
diff --git a/spec/lib/gitlab/alert_management/payload/base_spec.rb b/spec/lib/gitlab/alert_management/payload/base_spec.rb
index 6057167a57a9..2473fb13c011 100644
--- a/spec/lib/gitlab/alert_management/payload/base_spec.rb
+++ b/spec/lib/gitlab/alert_management/payload/base_spec.rb
@@ -170,7 +170,6 @@
gitlab_fingerprint: 'gitlab_fingerprint',
hosts: 'hosts',
monitoring_tool: 'monitoring_tool',
- gitlab_alert: create(:prometheus_alert, project: project),
service: 'service',
severity: 'critical',
starts_at: Time.current,
@@ -188,7 +187,6 @@
monitoring_tool: stubs[:monitoring_tool],
payload: raw_payload,
project_id: project.id,
- prometheus_alert: stubs[:gitlab_alert],
service: stubs[:service],
severity: stubs[:severity],
started_at: stubs[:starts_at],
--
GitLab