Commit ea298773 authored by Thong Kuah's avatar Thong Kuah

Merge branch 'tr-deprecate-alerts-via-feature-flag' into 'master'

Remove metrics dashboard alert functionality [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!63838
parents 1ee4e65f 820924de
...@@ -4,7 +4,7 @@ class Projects::AlertManagementController < Projects::ApplicationController ...@@ -4,7 +4,7 @@ class Projects::AlertManagementController < Projects::ApplicationController
before_action :authorize_read_alert_management_alert! before_action :authorize_read_alert_management_alert!
before_action(only: [:index]) do before_action(only: [:index]) do
push_frontend_feature_flag(:managed_alerts_deprecation, @project) push_frontend_feature_flag(:managed_alerts_deprecation, @project, default_enabled: :yaml)
end end
feature_category :incident_management feature_category :incident_management
......
...@@ -12,7 +12,7 @@ module Projects ...@@ -12,7 +12,7 @@ module Projects
before_action do before_action do
push_frontend_feature_flag(:prometheus_computed_alerts) push_frontend_feature_flag(:prometheus_computed_alerts)
push_frontend_feature_flag(:disable_metric_dashboard_refresh_rate) push_frontend_feature_flag(:disable_metric_dashboard_refresh_rate)
push_frontend_feature_flag(:managed_alerts_deprecation, @project) push_frontend_feature_flag(:managed_alerts_deprecation, @project, default_enabled: :yaml)
end end
feature_category :metrics feature_category :metrics
......
...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331863 ...@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331863
milestone: '14.0' milestone: '14.0'
type: development type: development
group: group::monitor group: group::monitor
default_enabled: false default_enabled: true
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment