Merge branch 'tr-remove-runbook-feature-flag' into 'master'

Remove the `alert_runbooks` feature flag

See merge request gitlab-org/gitlab!39315

app/assets/javascripts/monitoring/components/alert_widget_form.vue

@@ -302,7 +302,6 @@ export default {
         />
       </gl-form-group>
       <gl-form-group
-        v-if="glFeatures.alertRunbooks"
         :label="s__('PrometheusAlerts|Runbook URL (optional)')"
         label-for="alert-runbook"
       >

app/controllers/projects/environments_controller.rb

@@ -14,7 +14,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
 
     push_frontend_feature_flag(:prometheus_computed_alerts)
     push_frontend_feature_flag(:disable_metric_dashboard_refresh_rate)
-    push_frontend_feature_flag(:alert_runbooks)
     push_frontend_feature_flag(:metrics_dashboard_new_panel_page)
   end
   before_action :authorize_read_environment!, except: [:metrics, :additional_metrics, :metrics_dashboard, :metrics_redirect]

app/controllers/projects/metrics_dashboard_controller.rb

@@ -10,7 +10,6 @@ module Projects
     before_action do
       push_frontend_feature_flag(:prometheus_computed_alerts)
       push_frontend_feature_flag(:disable_metric_dashboard_refresh_rate)
-      push_frontend_feature_flag(:alert_runbooks)
       push_frontend_feature_flag(:metrics_dashboard_new_panel_page)
     end
 

changelogs/unreleased/tr-remove-runbook-feature-flag.yml

+---
+title: Add runbooks to metric alerts
+merge_request: 39315
+author:
+type: added

spec/frontend/monitoring/components/alert_widget_form_spec.js

@@ -36,7 +36,7 @@ describe('AlertWidgetForm', () => {
     configuredAlert: metricId,
   };
 
-  function createComponent(props = {}, featureFlags = {}) {
+  function createComponent(props = {}) {
     const propsData = {
       ...defaultProps,
       ...props,
@@ -44,9 +44,6 @@ describe('AlertWidgetForm', () => {
 
     wrapper = shallowMount(AlertWidgetForm, {
       propsData,
-      provide: {
-        glFeatures: featureFlags,
-      },
       stubs: {
         GlModal: ModalStub,
       },
@@ -88,7 +85,7 @@ describe('AlertWidgetForm', () => {
   });
 
   it('emits a "create" event when form submitted without existing alert', async () => {
-    createComponent(defaultProps, { alertRunbooks: true });
+    createComponent(defaultProps);
 
     modal().vm.$emit('shown');
 
@@ -109,7 +106,7 @@ describe('AlertWidgetForm', () => {
   });
 
   it('resets form when modal is dismissed (hidden)', () => {
-    createComponent(defaultProps, { alertRunbooks: true });
+    createComponent(defaultProps);
 
     modal().vm.$emit('shown');
 
@@ -199,7 +196,7 @@ describe('AlertWidgetForm', () => {
   it('emits "update" event when form changed', () => {
     const updatedRunbookUrl = `${INVALID_URL}/test`;
 
-    createComponent(propsWithAlertData, { alertRunbooks: true });
+    createComponent(propsWithAlertData);
 
     modal().vm.$emit('shown');
 
@@ -231,15 +228,9 @@ describe('AlertWidgetForm', () => {
     expect(submitButtonTrackingOpts()).toEqual(dataTrackingOptions.update);
   });
 
-  describe('alert runbooks feature flag', () => {
-    it('hides the runbook field when the flag is disabled', () => {
-      createComponent(undefined, { alertRunbooks: false });
-
-      expect(findRunbookField().exists()).toBe(false);
-    });
-
-    it('shows the runbook field when the flag is enabled', () => {
-      createComponent(undefined, { alertRunbooks: true });
+  describe('alert runbooks', () => {
+    it('shows the runbook field', () => {
+      createComponent();
 
       expect(findRunbookField().exists()).toBe(true);
     });