From 8295a5a8301106073752e5a849f1264bd8141c43 Mon Sep 17 00:00:00 2001
From: syasonik <syasonik@gitlab.com>
Date: Wed, 23 Jul 2025 22:53:49 -0500
Subject: [PATCH] Remove feature flag remove_monitor_metrics

Changelog: removed
---
 .../index/components/integrations_table.vue   | 12 +++-------
 .../concerns/integrations/actions.rb          |  4 ----
 .../settings/integrations_controller.rb       |  4 ----
 .../development/remove_monitor_metrics.yml    |  8 -------
 .../integrations/project_integrations_spec.rb |  1 -
 ee/spec/features/projects/navbar_spec.rb      |  1 -
 .../clusters/clusters/show.html.haml_spec.rb  |  1 -
 lib/gitlab/gon_helper.rb                      |  1 -
 .../admin/integrations_controller_spec.rb     |  1 -
 .../settings/integrations_controller_spec.rb  |  1 -
 .../settings/integrations_controller_spec.rb  | 19 ---------------
 .../instance_integrations_spec.rb             |  4 ----
 .../user_views_alerts_settings_spec.rb        |  1 -
 .../integrations/group_integrations_spec.rb   | 16 -------------
 .../integrations/project_integrations_spec.rb | 12 ----------
 .../components/integrations_table_spec.js     | 15 +-----------
 .../admin/integrations_controller_spec.rb     | 24 -------------------
 spec/requests/api/project_templates_spec.rb   |  1 -
 .../integrations/integration_settings_form.rb |  4 ----
 19 files changed, 4 insertions(+), 126 deletions(-)
 delete mode 100644 config/feature_flags/development/remove_monitor_metrics.yml

diff --git a/app/assets/javascripts/integrations/index/components/integrations_table.vue b/app/assets/javascripts/integrations/index/components/integrations_table.vue
index 4c5bdfd5333b29..f30875de3092fd 100644
--- a/app/assets/javascripts/integrations/index/components/integrations_table.vue
+++ b/app/assets/javascripts/integrations/index/components/integrations_table.vue
@@ -50,7 +50,7 @@ export default {
   },
   computed: {
     fields() {
-      if (this.filteredIntegrations.length === 0) {
+      if (this.integrations.length === 0) {
         return [];
       }
 
@@ -71,7 +71,7 @@ export default {
         },
       );
 
-      if (!this.inactive && this.filteredIntegrations.length > 0) {
+      if (!this.inactive && this.integrations.length > 0) {
         fields.push({
           key: 'updated_at',
           label: this.showUpdatedAt ? __('Last updated') : '',
@@ -90,12 +90,6 @@ export default {
 
       return fields;
     },
-    filteredIntegrations() {
-      return this.integrations.filter(
-        (integration) =>
-          !(integration.name === 'prometheus' && this.glFeatures.removeMonitorMetrics),
-      );
-    },
   },
   methods: {
     getStatusTooltipTitle(integration) {
@@ -115,7 +109,7 @@ export default {
 
 <template>
   <gl-table
-    :items="filteredIntegrations"
+    :items="integrations"
     :fields="fields"
     :empty-text="emptyText"
     show-empty
diff --git a/app/controllers/concerns/integrations/actions.rb b/app/controllers/concerns/integrations/actions.rb
index c09a5d3b741268..7f4e303a83ef8c 100644
--- a/app/controllers/concerns/integrations/actions.rb
+++ b/app/controllers/concerns/integrations/actions.rb
@@ -13,10 +13,6 @@ module Integrations::Actions
     before_action :integration, only: [:edit, :update, :overrides, :test]
     # rubocop:enable Rails/LexicallyScopedActionFilter
 
-    before_action :render_404, only: [:edit, :update, :overrides, :test], if: -> do
-      integration.is_a?(::Integrations::Prometheus) && Feature.enabled?(:remove_monitor_metrics)
-    end
-
     urgency :low, [:test]
   end
 
diff --git a/app/controllers/projects/settings/integrations_controller.rb b/app/controllers/projects/settings/integrations_controller.rb
index f4642f892fc83d..078730763e3845 100644
--- a/app/controllers/projects/settings/integrations_controller.rb
+++ b/app/controllers/projects/settings/integrations_controller.rb
@@ -13,10 +13,6 @@ class IntegrationsController < Projects::ApplicationController
       before_action :web_hook_logs, only: [:edit, :update]
       before_action -> { check_test_rate_limit! }, only: :test
 
-      before_action :render_404, only: [:edit, :update, :test], if: -> do
-        integration.is_a?(::Integrations::Prometheus) && Feature.enabled?(:remove_monitor_metrics)
-      end
-
       respond_to :html
 
       layout "project_settings"
diff --git a/config/feature_flags/development/remove_monitor_metrics.yml b/config/feature_flags/development/remove_monitor_metrics.yml
deleted file mode 100644
index d1aa57510ce9e9..00000000000000
--- a/config/feature_flags/development/remove_monitor_metrics.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: remove_monitor_metrics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/115714
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/399248
-milestone: '15.11'
-type: development
-group: group::respond
-default_enabled: true
diff --git a/ee/spec/features/projects/integrations/project_integrations_spec.rb b/ee/spec/features/projects/integrations/project_integrations_spec.rb
index 949033d6c8d54d..58dea5a93ab79d 100644
--- a/ee/spec/features/projects/integrations/project_integrations_spec.rb
+++ b/ee/spec/features/projects/integrations/project_integrations_spec.rb
@@ -8,7 +8,6 @@
     let(:integrations) { [Integrations::Github.new] }
 
     before do
-      stub_feature_flags(remove_monitor_metrics: false)
       stub_licensed_features(github_integration: true)
     end
 
diff --git a/ee/spec/features/projects/navbar_spec.rb b/ee/spec/features/projects/navbar_spec.rb
index 8a3a8078c1d6df..4bf3ba12eecd72 100644
--- a/ee/spec/features/projects/navbar_spec.rb
+++ b/ee/spec/features/projects/navbar_spec.rb
@@ -17,7 +17,6 @@
 
     stub_config(registry: { enabled: false })
     stub_feature_flags(agent_registry: false)
-    stub_feature_flags(remove_monitor_metrics: false)
     stub_feature_flags(hide_incident_management_features: false)
     insert_package_nav
     insert_infrastructure_registry_nav(s_('Terraform|Terraform states'))
diff --git a/ee/spec/views/clusters/clusters/show.html.haml_spec.rb b/ee/spec/views/clusters/clusters/show.html.haml_spec.rb
index ea237a3a648b60..ee3fcc8f019b6b 100644
--- a/ee/spec/views/clusters/clusters/show.html.haml_spec.rb
+++ b/ee/spec/views/clusters/clusters/show.html.haml_spec.rb
@@ -25,7 +25,6 @@
   end
 
   before do
-    stub_feature_flags(remove_monitor_metrics: false)
     allow(controller).to receive(:current_user).and_return(user)
   end
 
diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index d04fe59b48e144..f19928f50602bc 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -81,7 +81,6 @@ def add_gon_variables
       push_frontend_feature_flag(:organization_switching, current_user)
       push_frontend_feature_flag(:find_and_replace, current_user)
       # To be removed with https://gitlab.com/gitlab-org/gitlab/-/issues/399248
-      push_frontend_feature_flag(:remove_monitor_metrics)
       push_frontend_feature_flag(:work_item_view_for_issues)
       push_frontend_feature_flag(:merge_request_dashboard, current_user, type: :beta)
       push_frontend_feature_flag(:new_project_creation_form, current_user, type: :wip)
diff --git a/spec/controllers/admin/integrations_controller_spec.rb b/spec/controllers/admin/integrations_controller_spec.rb
index 5b8ee305acdcba..48387edb601819 100644
--- a/spec/controllers/admin/integrations_controller_spec.rb
+++ b/spec/controllers/admin/integrations_controller_spec.rb
@@ -7,7 +7,6 @@
   let_it_be(:organization) { current_organization }
 
   before do
-    stub_feature_flags(remove_monitor_metrics: false)
     sign_in(admin)
   end
 
diff --git a/spec/controllers/groups/settings/integrations_controller_spec.rb b/spec/controllers/groups/settings/integrations_controller_spec.rb
index bfecd66e758644..f059555d8aee24 100644
--- a/spec/controllers/groups/settings/integrations_controller_spec.rb
+++ b/spec/controllers/groups/settings/integrations_controller_spec.rb
@@ -7,7 +7,6 @@
   let_it_be(:group) { create(:group) }
 
   before do
-    stub_feature_flags(remove_monitor_metrics: false)
     sign_in(user)
   end
 
diff --git a/spec/controllers/projects/settings/integrations_controller_spec.rb b/spec/controllers/projects/settings/integrations_controller_spec.rb
index 26442d31a94151..334e8928400102 100644
--- a/spec/controllers/projects/settings/integrations_controller_spec.rb
+++ b/spec/controllers/projects/settings/integrations_controller_spec.rb
@@ -246,16 +246,6 @@
         expect(response).to have_gitlab_http_status(:ok)
       end
     end
-
-    context 'when prometheus integration' do
-      let_it_be(:integration) { create(:prometheus_integration, project: project) }
-
-      it 'returns 404' do
-        put :test, params: project_params(service: { active: 'true' })
-        # because remove_monitor_metrics feature flag is enabled
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
   end
 
   describe 'PUT #update' do
@@ -423,15 +413,6 @@
           end
         end
       end
-
-      context 'when prometheus integration' do
-        let_it_be(:integration) { create(:prometheus_integration, project: project) }
-
-        it 'returns 404' do
-          # because remove_monitor_metrics feature flag is enabled
-          expect(response).to have_gitlab_http_status(:not_found)
-        end
-      end
     end
 
     describe 'as JSON' do
diff --git a/spec/features/admin/integrations/instance_integrations_spec.rb b/spec/features/admin/integrations/instance_integrations_spec.rb
index 5f2ce1d0411845..066f3a57457aa1 100644
--- a/spec/features/admin/integrations/instance_integrations_spec.rb
+++ b/spec/features/admin/integrations/instance_integrations_spec.rb
@@ -5,10 +5,6 @@
 RSpec.describe 'Instance integrations', :js, feature_category: :integrations do
   include_context 'instance integration activation'
 
-  before do
-    stub_feature_flags(remove_monitor_metrics: false)
-  end
-
   it_behaves_like 'integration settings form' do
     let(:integrations) do
       Integration.find_or_initialize_all_non_project_specific(
diff --git a/spec/features/alerts_settings/user_views_alerts_settings_spec.rb b/spec/features/alerts_settings/user_views_alerts_settings_spec.rb
index ed983d81f26944..eba7879ca1c3f3 100644
--- a/spec/features/alerts_settings/user_views_alerts_settings_spec.rb
+++ b/spec/features/alerts_settings/user_views_alerts_settings_spec.rb
@@ -14,7 +14,6 @@
   describe 'when viewing alert integrations as a maintainer' do
     context 'with the default page permissions' do
       before do
-        stub_feature_flags(remove_monitor_metrics: false)
         visit project_settings_operations_path(project, anchor: 'js-alert-management-settings')
         wait_for_requests
       end
diff --git a/spec/features/groups/integrations/group_integrations_spec.rb b/spec/features/groups/integrations/group_integrations_spec.rb
index 0067ae389ecefa..a1b163be315144 100644
--- a/spec/features/groups/integrations/group_integrations_spec.rb
+++ b/spec/features/groups/integrations/group_integrations_spec.rb
@@ -5,10 +5,6 @@
 RSpec.describe 'Group integrations', :js, feature_category: :integrations do
   include_context 'group integration activation'
 
-  before do
-    stub_feature_flags(remove_monitor_metrics: false)
-  end
-
   it_behaves_like 'integration settings form' do
     let(:integrations) { Integration.find_or_initialize_all_non_project_specific(Integration.for_group(group)) }
 
@@ -16,16 +12,4 @@ def navigate_to_integration(integration)
       visit_group_integration(integration.title)
     end
   end
-
-  context 'with remove_monitor_metrics flag enabled' do
-    before do
-      stub_feature_flags(remove_monitor_metrics: true)
-    end
-
-    it 'returns a 404 for the prometheus edit page' do
-      visit edit_group_settings_integration_path(group, :prometheus)
-
-      expect(page).to have_content "Page not found"
-    end
-  end
 end
diff --git a/spec/features/projects/integrations/project_integrations_spec.rb b/spec/features/projects/integrations/project_integrations_spec.rb
index 3f51378c901287..d99b6ca90922cd 100644
--- a/spec/features/projects/integrations/project_integrations_spec.rb
+++ b/spec/features/projects/integrations/project_integrations_spec.rb
@@ -12,16 +12,4 @@ def navigate_to_integration(integration)
       visit_project_integration(integration.title)
     end
   end
-
-  context 'with remove_monitor_metrics flag enabled' do
-    before do
-      stub_feature_flags(remove_monitor_metrics: true)
-    end
-
-    it 'returns a 404 for the prometheus edit page' do
-      visit edit_project_settings_integration_path(project, :prometheus)
-
-      expect(page).to have_content "Page not found"
-    end
-  end
 end
diff --git a/spec/frontend/integrations/index/components/integrations_table_spec.js b/spec/frontend/integrations/index/components/integrations_table_spec.js
index 707890b5146f19..543521dcae6dbb 100644
--- a/spec/frontend/integrations/index/components/integrations_table_spec.js
+++ b/spec/frontend/integrations/index/components/integrations_table_spec.js
@@ -1,4 +1,4 @@
-import { GlTable, GlLink, GlButton } from '@gitlab/ui';
+import { GlTable, GlButton } from '@gitlab/ui';
 import { mount } from '@vue/test-utils';
 import IntegrationsTable from '~/integrations/index/components/integrations_table.vue';
 import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue';
@@ -52,19 +52,6 @@ describe('IntegrationsTable', () => {
     });
   });
 
-  describe.each([true, false])(
-    'when `remove_monitor_metrics` flag  is %p',
-    (removeMonitorMetrics) => {
-      beforeEach(() => {
-        createComponent({ integrations: [mockInactiveIntegrations[3]] }, { removeMonitorMetrics });
-      });
-
-      it(`${removeMonitorMetrics ? 'does not render' : 'renders'} prometheus integration`, () => {
-        expect(findTable().findComponent(GlLink).exists()).toBe(!removeMonitorMetrics);
-      });
-    },
-  );
-
   describe('when no integrations are received', () => {
     beforeEach(() => {
       createComponent({ integrations: [] });
diff --git a/spec/requests/admin/integrations_controller_spec.rb b/spec/requests/admin/integrations_controller_spec.rb
index 32b7505c369df6..84e37e54103253 100644
--- a/spec/requests/admin/integrations_controller_spec.rb
+++ b/spec/requests/admin/integrations_controller_spec.rb
@@ -9,17 +9,6 @@
     sign_in(admin)
   end
 
-  describe 'GET #edit' do
-    context 'for prometheus integration' do
-      # feature flag remove_monitor_metrics is enabled by default in specs
-      it 'renders a 404' do
-        get edit_admin_application_settings_integration_path(:prometheus)
-
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
-  end
-
   describe 'GET #overrides' do
     let(:overrides_path) { overrides_admin_application_settings_integration_path(integration, format: format) }
 
@@ -60,18 +49,5 @@
         end
       end
     end
-
-    context 'for prometheus integration' do
-      # feature flag remove_monitor_metrics is enabled by default in specs
-      let_it_be(:integration) { create(:prometheus_integration, :instance) }
-
-      let(:format) { :html }
-
-      it 'renders a 404' do
-        get overrides_path
-
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
   end
 end
diff --git a/spec/requests/api/project_templates_spec.rb b/spec/requests/api/project_templates_spec.rb
index da051c895c8aac..b84d180da99557 100644
--- a/spec/requests/api/project_templates_spec.rb
+++ b/spec/requests/api/project_templates_spec.rb
@@ -11,7 +11,6 @@
   let(:url_encoded_path) { "#{public_project.namespace.path}%2F#{public_project.path}" }
 
   before do
-    stub_feature_flags(remove_monitor_metrics: false)
     private_project.add_developer(reporter)
     private_project.add_guest(guest)
   end
diff --git a/spec/support/shared_examples/integrations/integration_settings_form.rb b/spec/support/shared_examples/integrations/integration_settings_form.rb
index 7d3cfeca88af49..0ff0419dd0d2a8 100644
--- a/spec/support/shared_examples/integrations/integration_settings_form.rb
+++ b/spec/support/shared_examples/integrations/integration_settings_form.rb
@@ -3,10 +3,6 @@
 RSpec.shared_examples 'integration settings form' do
   include IntegrationsHelper
 
-  before do
-    stub_feature_flags(remove_monitor_metrics: false)
-  end
-
   # Note: these specs don't validate channel fields
   # which are present on a few integrations
   it 'displays all the integrations', feature_category: :integrations do
-- 
GitLab