Merge branch 'update-feature-categories-2020-11-19' into 'master'

Update feature categories for 2020-11-19

See merge request gitlab-org/gitlab!48133

app/controllers/admin/cohorts_controller.rb

@@ -5,7 +5,7 @@ class Admin::CohortsController < Admin::ApplicationController
 
   track_unique_visits :index, target_id: 'i_analytics_cohorts'
 
-  feature_category :instance_statistics
+  feature_category :devops_reports
 
   def index
     if Gitlab::CurrentSettings.usage_ping_enabled

app/controllers/admin/instance_review_controller.rb

 # frozen_string_literal: true
 class Admin::InstanceReviewController < Admin::ApplicationController
-  feature_category :instance_statistics
+  feature_category :devops_reports
 
   def index
     redirect_to("#{::Gitlab::SubscriptionPortal::SUBSCRIPTIONS_URL}/instance_review?#{instance_review_params}")

app/controllers/admin/instance_statistics_controller.rb

@@ -7,7 +7,7 @@ class Admin::InstanceStatisticsController < Admin::ApplicationController
 
   track_unique_visits :index, target_id: 'i_analytics_instance_statistics'
 
-  feature_category :instance_statistics
+  feature_category :devops_reports
 
   def index
   end

app/controllers/projects/alert_management_controller.rb

@@ -3,7 +3,7 @@
 class Projects::AlertManagementController < Projects::ApplicationController
   before_action :authorize_read_alert_management_alert!
 
-  feature_category :alert_management
+  feature_category :incident_management
 
   def index
   end

app/controllers/projects/alerting/notifications_controller.rb

@@ -10,7 +10,7 @@ module Projects
 
       prepend_before_action :repository, :project_without_auth
 
-      feature_category :alert_management
+      feature_category :incident_management
 
       def create
         token = extract_alert_manager_token(request)

app/controllers/projects/prometheus/alerts_controller.rb

@@ -16,7 +16,7 @@ module Projects
       before_action :authorize_read_prometheus_alerts!, except: [:notify]
       before_action :alert, only: [:update, :show, :destroy, :metrics_dashboard]
 
-      feature_category :alert_management
+      feature_category :incident_management
 
       def index
         render json: serialize_as_json(alerts)

app/workers/all_queues.yml

@@ -124,7 +124,7 @@
   :idempotent:
   :tags: []
 - :name: cronjob:analytics_instance_statistics_count_job_trigger
-  :feature_category: :instance_statistics
+  :feature_category: :devops_reports
   :has_external_dependencies:
   :urgency: :low
   :resource_boundary: :unknown
@@ -1329,7 +1329,7 @@
   :idempotent: true
   :tags: []
 - :name: analytics_instance_statistics_counter_job
-  :feature_category: :instance_statistics
+  :feature_category: :devops_reports
   :has_external_dependencies:
   :urgency: :low
   :resource_boundary: :unknown

app/workers/analytics/instance_statistics/count_job_trigger_worker.rb

@@ -8,7 +8,7 @@ module Analytics
 
       DEFAULT_DELAY = 3.minutes.freeze
 
-      feature_category :instance_statistics
+      feature_category :devops_reports
       urgency :low
 
       idempotent!

app/workers/analytics/instance_statistics/counter_job_worker.rb

@@ -5,7 +5,7 @@ module Analytics
     class CounterJobWorker
       include ApplicationWorker
 
-      feature_category :instance_statistics
+      feature_category :devops_reports
       urgency :low
 
       idempotent!

config/feature_categories.yml

@@ -9,7 +9,6 @@
 ---
 - accessibility_testing
 - advanced_deployments
-- alert_management
 - analysis
 - api
 - attack_emulation
@@ -21,7 +20,7 @@
 - boards
 - chatops
 - cloud_native_installation
-- cluster_cost_optimization
+- cluster_cost_management
 - code_analytics
 - code_quality
 - code_review
@@ -47,6 +46,7 @@
 - epics
 - error_tracking
 - feature_flags
+- five_minute_production_app
 - foundations
 - fuzz_testing
 - gdk
@@ -59,9 +59,10 @@
 - helm_chart_registry
 - importers
 - incident_management
+- infrastructure
 - infrastructure_as_code
+- insider_threat
 - insights
-- instance_statistics
 - integrations
 - interactive_application_security_testing
 - internationalization
@@ -75,8 +76,11 @@
 - load_testing
 - logging
 - malware_scanning
+- memory
 - merge_trains
 - metrics
+- mlops
+- mobile_signing_deployment
 - navigation
 - omnibus_package
 - package_registry
@@ -114,7 +118,7 @@
 - tracing
 - usability_testing
 - users
-- value_stream_analytics
+- value_stream_management
 - vulnerability_database
 - vulnerability_management
 - web_firewall

lib/api/statistics.rb

@@ -4,7 +4,7 @@ module API
   class Statistics < ::API::Base
     before { authenticated_as_admin! }
 
-    feature_category :instance_statistics
+    feature_category :devops_reports
 
     COUNTED_ITEMS = [Project, User, Group, ForkNetworkMember, ForkNetwork, Issue,
                      MergeRequest, Note, Snippet, Key, Milestone].freeze