From ef597de6ad4563d998db669bc10fc9373e6ec190 Mon Sep 17 00:00:00 2001
From: Niko Belokolodov <nbelokolodov@gitlab.com>
Date: Mon, 21 Mar 2022 16:42:28 +1300
Subject: [PATCH] Remove admin_application_settings_service_usage_data_center
feature flag
Changelog: other
---
app/views/layouts/nav/sidebar/_admin.html.haml | 9 ++++-----
...in_application_settings_service_usage_data_center.yml | 8 --------
doc/development/service_ping/index.md | 3 ++-
3 files changed, 6 insertions(+), 14 deletions(-)
delete mode 100644 config/feature_flags/development/admin_application_settings_service_usage_data_center.yml
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml
index 52eea73ecd269..96ba982cac834 100644
--- a/app/views/layouts/nav/sidebar/_admin.html.haml
+++ b/app/views/layouts/nav/sidebar/_admin.html.haml
@@ -269,11 +269,10 @@
= link_to metrics_and_profiling_admin_application_settings_path, title: _('Metrics and profiling'), class: 'qa-admin-settings-metrics-and-profiling-item' do
%span
= _('Metrics and profiling')
- - if Feature.enabled?(:admin_application_settings_service_usage_data_center, default_enabled: :yaml)
- = nav_link(path: ['application_settings#service_usage_data']) do
- = link_to service_usage_data_admin_application_settings_path, title: _('Service usage data') do
- %span
- = _('Service usage data')
+ = nav_link(path: ['application_settings#service_usage_data']) do
+ = link_to service_usage_data_admin_application_settings_path, title: _('Service usage data') do
+ %span
+ = _('Service usage data')
= nav_link(path: 'application_settings#network') do
= link_to network_admin_application_settings_path, title: _('Network'), data: { qa_selector: 'admin_settings_network_item' } do
%span
diff --git a/config/feature_flags/development/admin_application_settings_service_usage_data_center.yml b/config/feature_flags/development/admin_application_settings_service_usage_data_center.yml
deleted file mode 100644
index 465f9061eb4bd..0000000000000
--- a/config/feature_flags/development/admin_application_settings_service_usage_data_center.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: admin_application_settings_service_usage_data_center
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/78747
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351268
-milestone: '14.8'
-type: development
-group: group::product intelligence
-default_enabled: true
diff --git a/doc/development/service_ping/index.md b/doc/development/service_ping/index.md
index 6878fd1bf285e..fd21b770ba363 100644
--- a/doc/development/service_ping/index.md
+++ b/doc/development/service_ping/index.md
@@ -582,7 +582,8 @@ ServicePing::SubmitService.new(skip_db_write: true).execute
## Manually upload Service Ping payload
-> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/7388) in GitLab 14.8 with a flag named `admin_application_settings_service_usage_data_center`. Disabled by default.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/7388) in GitLab 14.8 with a flag named `admin_application_settings_service_usage_data_center`. Disabled by default.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/83265) in GitLab 14.10.
Service Ping payload can be uploaded to GitLab even if your application instance doesn't have access to the internet,
or you don't have Service Ping [cron job](#how-service-ping-works) enabled.
--
GitLab