Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1415 files changed, 6684 insertions, 3167 deletions

diff --git a/config/application.rb b/config/application.rb
index 6526be15cd4..06a5a726d92 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -32,7 +32,7 @@ module Gitlab
     require_dependency Rails.root.join('lib/gitlab/middleware/rack_multipart_tempfile_factory')
     require_dependency Rails.root.join('lib/gitlab/runtime')
 
-    config.autoloader = :classic
+    config.autoloader = :zeitwerk
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
@@ -86,7 +86,11 @@ module Gitlab
     # Rake tasks ignore the eager loading settings, so we need to set the
     # autoload paths explicitly
     config.autoload_paths = config.eager_load_paths.dup
+
+    # These are only used in Rake tasks so we don't need to add these to eager_load_paths
     config.autoload_paths.push("#{config.root}/lib/generators")
+    Gitlab.ee { config.autoload_paths.push("#{config.root}/ee/lib/generators") }
+    Gitlab.jh { config.autoload_paths.push("#{config.root}/jh/lib/generators") }
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
@@ -168,6 +172,11 @@ module Gitlab
     # like if you have constraints or database-specific column types
     config.active_record.schema_format = :sql
 
+    # Dump all DB schemas even if schema_search_path is defined,
+    # so that we get the same db/structure.sql
+    # regardless if schema_search_path is set, or not.
+    config.active_record.dump_schemas = :all
+
     # Use new connection handling so that we can use Rails 6.1+ multiple
     # database support.
     config.active_record.legacy_connection_handling = false
@@ -214,6 +223,7 @@ module Gitlab
     config.assets.precompile << "page_bundles/jira_connect.css"
     config.assets.precompile << "page_bundles/jira_connect_users.css"
     config.assets.precompile << "page_bundles/learn_gitlab.css"
+    config.assets.precompile << "page_bundles/marketing_popover.css"
     config.assets.precompile << "page_bundles/members.css"
     config.assets.precompile << "page_bundles/merge_conflicts.css"
     config.assets.precompile << "page_bundles/merge_requests.css"
@@ -264,7 +274,9 @@ module Gitlab
     # Import path for EE specific SCSS entry point
     # In CE it will import a noop file, in EE a functioning file
     # Order is important, so that the ee file takes precedence:
+    config.assets.paths << "#{config.root}/jh/app/assets/stylesheets/_jh" if Gitlab.jh?
     config.assets.paths << "#{config.root}/ee/app/assets/stylesheets/_ee" if Gitlab.ee?
+    config.assets.paths << "#{config.root}/app/assets/stylesheets/_jh"
     config.assets.paths << "#{config.root}/app/assets/stylesheets/_ee"
 
     config.assets.paths << "#{config.root}/vendor/assets/javascripts/"
@@ -422,6 +434,21 @@ module Gitlab
       end
     end
 
+    # Load JH initializers under JH. Load ordering is:
+    # 1. prepend_helpers_path
+    # 2. before_zeitwerk
+    # 3. let_zeitwerk_take_over
+    # 4. move_initializers
+    # 5. load_config_initializers
+    # 6. load_jh_config_initializers
+    Gitlab.jh do
+      initializer :load_jh_config_initializers, after: :load_config_initializers do
+        Dir[Rails.root.join('jh/config/initializers/*.rb')].sort.each do |initializer|
+          load_config_initializer(initializer)
+        end
+      end
+    end
+
     # Add assets for variants of GitLab. They should take precedence over CE.
     # This means if multiple files exist, e.g.:
     #
diff --git a/config/environments/production.rb b/config/environments/production.rb
index e1a7db8d860..f8964479e60 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -51,9 +51,6 @@ Rails.application.configure do
   # Use a different logger for distributed setups
   # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
-  # Enable serving of images, stylesheets, and JavaScripts from an asset server
-  config.action_controller.asset_host = ENV['GITLAB_CDN_HOST'] if ENV['GITLAB_CDN_HOST'].present?
-
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
 
diff --git a/config/events/cluster_services_prometheus_disabled_manual_prometheus.yml b/config/events/cluster_services_prometheus_disabled_manual_prometheus.yml
index b1fb10ad8f0..805929b01b6 100644
--- a/config/events/cluster_services_prometheus_disabled_manual_prometheus.yml
+++ b/config/events/cluster_services_prometheus_disabled_manual_prometheus.yml
@@ -7,8 +7,8 @@ value_description:
 extra_properties:
 identifiers:
 product_section: dev
-product_stage: create
-product_group: ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category:
 milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62645
diff --git a/config/events/cluster_services_prometheus_enabled_manual_prometheus.yml b/config/events/cluster_services_prometheus_enabled_manual_prometheus.yml
index df35543a509..d9377a07cf2 100644
--- a/config/events/cluster_services_prometheus_enabled_manual_prometheus.yml
+++ b/config/events/cluster_services_prometheus_enabled_manual_prometheus.yml
@@ -7,8 +7,8 @@ value_description:
 extra_properties:
 identifiers:
 product_section: dev
-product_stage: create
-product_group: ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category:
 milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62645
diff --git a/config/feature_categories.yml b/config/feature_categories.yml
index 982b512cd9a..01446f931cf 100644
--- a/config/feature_categories.yml
+++ b/config/feature_categories.yml
@@ -9,7 +9,6 @@
 ---
 - accessibility_testing
 - advanced_deployments
-- api
 - attack_emulation
 - audit_events
 - audit_reports
@@ -65,14 +64,12 @@
 - infrastructure
 - infrastructure_as_code
 - insider_threat
-- insights
 - integrations
 - intel_code_security
 - interactive_application_security_testing
 - internationalization
 - issue_tracking
 - jenkins_importer
-- jira_importer
 - kubernetes_management
 - license
 - license_compliance
@@ -120,7 +117,6 @@
 - static_site_editor
 - subgroups
 - synthetic_monitoring
-- templates
 - time_tracking
 - tracing
 - usability_testing
diff --git a/config/feature_flags/development/mr_collapsed_approval_rules.yml b/config/feature_flags/development/between_uses_list_commits.yml
index 5fca48ddc3a..84b34e1f8b2 100644
--- a/config/feature_flags/development/mr_collapsed_approval_rules.yml
+++ b/config/feature_flags/development/between_uses_list_commits.yml
@@ -1,8 +1,8 @@
 ---
-name: mr_collapsed_approval_rules
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47475
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284052
-milestone: '13.6'
+name: between_uses_list_commits
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67591
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337960
+milestone: '14.2'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/one_megabyte_file_size_limit.yml b/config/feature_flags/development/cache_merge_to_ref_calls.yml
index 2bebebf8220..495ed9236d3 100644
--- a/config/feature_flags/development/one_megabyte_file_size_limit.yml
+++ b/config/feature_flags/development/cache_merge_to_ref_calls.yml
@@ -1,8 +1,8 @@
 ---
-name: one_megabyte_file_size_limit
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65167
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334916
-milestone: '14.1'
+name: cache_merge_to_ref_calls
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67789
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338251
+milestone: '14.2'
 type: development
 group: group::code review
 default_enabled: false
diff --git a/config/feature_flags/development/devops_adoption_feature.yml b/config/feature_flags/development/cache_shared_runners_enabled.yml
index 46a1ed7cc42..a5ff0df5aca 100644
--- a/config/feature_flags/development/devops_adoption_feature.yml
+++ b/config/feature_flags/development/cache_shared_runners_enabled.yml
@@ -1,8 +1,8 @@
 ---
-name: devops_adoption_feature
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46005
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325795
-milestone: '13.6'
+name: cache_shared_runners_enabled
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68002
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338267
+milestone: '14.2'
 type: development
 group: group::optimize
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/git_access_batched_changes_size.yml b/config/feature_flags/development/changes_batch_commits.yml
index 881ffcad5f1..2b276759fb1 100644
--- a/config/feature_flags/development/git_access_batched_changes_size.yml
+++ b/config/feature_flags/development/changes_batch_commits.yml
@@ -1,8 +1,8 @@
 ---
-name: git_access_batched_changes_size
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64503
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334130
-milestone: '14.1'
+name: changes_batch_commits
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66731
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336992
+milestone: '14.2'
 type: development
 group: group::gitaly
 default_enabled: false
diff --git a/config/feature_flags/development/ci_daily_limit_for_pipeline_schedules.yml b/config/feature_flags/development/ci_daily_limit_for_pipeline_schedules.yml
index ad7c5b2fa91..6b398663a6a 100644
--- a/config/feature_flags/development/ci_daily_limit_for_pipeline_schedules.yml
+++ b/config/feature_flags/development/ci_daily_limit_for_pipeline_schedules.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332333
 milestone: '14.0'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/graphql_pipeline_details_users.yml b/config/feature_flags/development/ci_include_rules.yml
index 97a2918bed5..a53f818b4f4 100644
--- a/config/feature_flags/development/graphql_pipeline_details_users.yml
+++ b/config/feature_flags/development/ci_include_rules.yml
@@ -1,8 +1,8 @@
 ---
-name: graphql_pipeline_details_users
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52092
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299112
-milestone: '13.9'
+name: ci_include_rules
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67409
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337507
+milestone: '14.2'
 type: development
 group: group::pipeline authoring
 default_enabled: false
diff --git a/config/feature_flags/development/ci_modified_paths_of_external_prs.yml b/config/feature_flags/development/ci_modified_paths_of_external_prs.yml
index 70d5e0ce076..62f7eb4663f 100644
--- a/config/feature_flags/development/ci_modified_paths_of_external_prs.yml
+++ b/config/feature_flags/development/ci_modified_paths_of_external_prs.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330605
 milestone: '13.12'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/ci_jobs_trace_size_limit.yml b/config/feature_flags/development/ci_pending_builds_maintain_ci_minutes_data.yml
index c66a4aa9a22..f073e94e322 100644
--- a/config/feature_flags/development/ci_jobs_trace_size_limit.yml
+++ b/config/feature_flags/development/ci_pending_builds_maintain_ci_minutes_data.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_jobs_trace_size_limit
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65349
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335259
-milestone: '14.1'
+name: ci_pending_builds_maintain_ci_minutes_data
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64443
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338149
+milestone: '14.2'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/ci_pending_builds_maintain_shared_runners_data.yml b/config/feature_flags/development/ci_pending_builds_maintain_shared_runners_data.yml
index 5a8b89edfad..16b318509dc 100644
--- a/config/feature_flags/development/ci_pending_builds_maintain_shared_runners_data.yml
+++ b/config/feature_flags/development/ci_pending_builds_maintain_shared_runners_data.yml
@@ -1,7 +1,7 @@
 ---
 name: ci_pending_builds_maintain_shared_runners_data
-introduced_by_url:
-rollout_issue_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64644
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338152
 milestone: '14.1'
 type: development
 group: group::pipeline execution
diff --git a/config/feature_flags/development/ci_wildcard_file_paths.yml b/config/feature_flags/development/ci_pipeline_add_job_with_lock.yml
index 43a681d171c..48aa64ba7f4 100644
--- a/config/feature_flags/development/ci_wildcard_file_paths.yml
+++ b/config/feature_flags/development/ci_pipeline_add_job_with_lock.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_wildcard_file_paths
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58999
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327315
-milestone: '13.11'
+name: ci_pipeline_add_job_with_lock
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65754
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337628
+milestone: '14.2'
 type: development
 group: group::pipeline authoring
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/ci_queueing_denormalize_ci_minutes_information.yml b/config/feature_flags/development/ci_queueing_denormalize_ci_minutes_information.yml
new file mode 100644
index 00000000000..b93742ad0a7
--- /dev/null
+++ b/config/feature_flags/development/ci_queueing_denormalize_ci_minutes_information.yml
@@ -0,0 +1,8 @@
+---
+name: ci_queueing_denormalize_ci_minutes_information
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66962
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338290
+milestone: '14.2'
+type: development
+group: 'group::pipeline execution'
+default_enabled: false
diff --git a/config/feature_flags/development/efficient_counter_attribute.yml b/config/feature_flags/development/ci_queueing_denormalize_shared_runners_information.yml
index ee44bd77d60..326beaf6740 100644
--- a/config/feature_flags/development/efficient_counter_attribute.yml
+++ b/config/feature_flags/development/ci_queueing_denormalize_shared_runners_information.yml
@@ -1,8 +1,8 @@
 ---
-name: efficient_counter_attribute
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35878
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238535
-milestone: '13.3'
+name: ci_queueing_denormalize_shared_runners_information
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66082
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338289
+milestone: '14.2'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/runner_list_view_vue_ui.yml b/config/feature_flags/development/ci_runner_limits_override.yml
index 2c539e5b91c..a5dd74d35af 100644
--- a/config/feature_flags/development/runner_list_view_vue_ui.yml
+++ b/config/feature_flags/development/ci_runner_limits_override.yml
@@ -1,8 +1,8 @@
 ---
-name: runner_list_view_vue_ui
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61241
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330969
-milestone: '13.12'
+name: ci_runner_limits_override
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67152
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337224
+milestone: '14.2'
 type: development
 group: group::runner
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/ci_same_stage_job_needs.yml b/config/feature_flags/development/ci_same_stage_job_needs.yml
index a7247320d0d..dfb54edf030 100644
--- a/config/feature_flags/development/ci_same_stage_job_needs.yml
+++ b/config/feature_flags/development/ci_same_stage_job_needs.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328253
 milestone: '14.1'
 type: development
 group: group::pipeline authoring
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/compare_repo_dropdown.yml b/config/feature_flags/development/compare_repo_dropdown.yml
deleted file mode 100644
index e41e4e0d8d7..00000000000
--- a/config/feature_flags/development/compare_repo_dropdown.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: compare_repo_dropdown
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/14615
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/322141
-milestone: '13.9'
-type: development
-group: group::source code
-default_enabled: true
diff --git a/config/feature_flags/development/combined_menu.yml b/config/feature_flags/development/dast_meta_tag_validation.yml
index 94ab3e96654..50ef18df45a 100644
--- a/config/feature_flags/development/combined_menu.yml
+++ b/config/feature_flags/development/dast_meta_tag_validation.yml
@@ -1,8 +1,8 @@
 ---
-name: combined_menu
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56249
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/324086
-milestone: '13.10'
+name: dast_meta_tag_validation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67945
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337711
+milestone: '14.2'
 type: development
-group: group::editor
+group: group::dynamic analysis
 default_enabled: true
diff --git a/config/feature_flags/development/infrastructure_registry_page.yml b/config/feature_flags/development/dast_profile_disable_joins.yml
index af78744280a..469e930dd7c 100644
--- a/config/feature_flags/development/infrastructure_registry_page.yml
+++ b/config/feature_flags/development/dast_profile_disable_joins.yml
@@ -1,8 +1,8 @@
 ---
-name: infrastructure_registry_page
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57338
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326460
-milestone: '13.11'
+name: dast_profile_disable_joins
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66709
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336944
+milestone: '14.2'
 type: development
-group: group::package
+group: group::dynamic analysis
 default_enabled: true
diff --git a/config/feature_flags/development/dast_runner_site_validation.yml b/config/feature_flags/development/dast_runner_site_validation.yml
index f8ad90062f6..e39a8a6d1e3 100644
--- a/config/feature_flags/development/dast_runner_site_validation.yml
+++ b/config/feature_flags/development/dast_runner_site_validation.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331082
 milestone: '14.0'
 type: development
 group: group::dynamic analysis
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/dast_scanner_profile_disable_joins.yml b/config/feature_flags/development/dast_scanner_profile_disable_joins.yml
new file mode 100644
index 00000000000..8c27633b785
--- /dev/null
+++ b/config/feature_flags/development/dast_scanner_profile_disable_joins.yml
@@ -0,0 +1,8 @@
+---
+name: dast_scanner_profile_disable_joins
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66709
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336946
+milestone: '14.2'
+type: development
+group: group::dynamic analysis
+default_enabled: true
diff --git a/config/feature_flags/development/dast_site_profile_disable_joins.yml b/config/feature_flags/development/dast_site_profile_disable_joins.yml
new file mode 100644
index 00000000000..08327a4abf1
--- /dev/null
+++ b/config/feature_flags/development/dast_site_profile_disable_joins.yml
@@ -0,0 +1,8 @@
+---
+name: dast_site_profile_disable_joins
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66709
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336945
+milestone: '14.2'
+type: development
+group: group::dynamic analysis
+default_enabled: true
diff --git a/config/feature_flags/development/multiple_database_metrics.yml b/config/feature_flags/development/debian_group_packages.yml
index 7a700982022..bc0c2eaf8eb 100644
--- a/config/feature_flags/development/multiple_database_metrics.yml
+++ b/config/feature_flags/development/debian_group_packages.yml
@@ -1,8 +1,8 @@
 ---
-name: multiple_database_metrics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63490
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333227
+name: debian_group_packages
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66188
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336536
 milestone: '14.1'
 type: development
-group: group::sharding
+group: group::package
 default_enabled: false
diff --git a/config/feature_flags/development/debian_packages.yml b/config/feature_flags/development/debian_packages.yml
index df4c155bba9..98bc5d898a5 100644
--- a/config/feature_flags/development/debian_packages.yml
+++ b/config/feature_flags/development/debian_packages.yml
@@ -1,7 +1,7 @@
 ---
 name: debian_packages
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42670
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/5835
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337288
 milestone: '13.5'
 type: development
 group: group::package
diff --git a/config/feature_flags/development/diff_searching_usage_data.yml b/config/feature_flags/development/diff_searching_usage_data.yml
new file mode 100644
index 00000000000..27bd2c4959e
--- /dev/null
+++ b/config/feature_flags/development/diff_searching_usage_data.yml
@@ -0,0 +1,8 @@
+---
+name: diff_searching_usage_data
+introduced_by_url:
+rollout_issue_url:
+milestone: '14.2'
+type: development
+group: group::code review
+default_enabled: true
diff --git a/config/feature_flags/development/diffs_virtual_scrolling.yml b/config/feature_flags/development/diffs_virtual_scrolling.yml
index 051fa15e1fa..add1297d8b8 100644
--- a/config/feature_flags/development/diffs_virtual_scrolling.yml
+++ b/config/feature_flags/development/diffs_virtual_scrolling.yml
@@ -5,4 +5,4 @@ rollout_issue_url:
 milestone: '13.12'
 type: development
 group: group::code review
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/display_merge_conflicts_in_diff.yml b/config/feature_flags/development/display_merge_conflicts_in_diff.yml
index b81b6b25473..50c22b52d11 100644
--- a/config/feature_flags/development/display_merge_conflicts_in_diff.yml
+++ b/config/feature_flags/development/display_merge_conflicts_in_diff.yml
@@ -1,7 +1,7 @@
 ---
 name: display_merge_conflicts_in_diff
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45008
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/277097
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/276918
 milestone: '13.5'
 type: development
 group: group::code review
diff --git a/config/feature_flags/development/drop_detached_partitions.yml b/config/feature_flags/development/drop_detached_partitions.yml
new file mode 100644
index 00000000000..b49cf78d28c
--- /dev/null
+++ b/config/feature_flags/development/drop_detached_partitions.yml
@@ -0,0 +1,8 @@
+---
+name: drop_detached_partitions
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67056
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337155
+milestone: '14.2'
+type: development
+group: group::database
+default_enabled: false
diff --git a/config/feature_flags/development/evalute_protected_tag_for_release_permissions.yml b/config/feature_flags/development/evalute_protected_tag_for_release_permissions.yml
deleted file mode 100644
index a314c0263ba..00000000000
--- a/config/feature_flags/development/evalute_protected_tag_for_release_permissions.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: evalute_protected_tag_for_release_permissions
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64693
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334368
-milestone: '14.1'
-type: development
-group: group::release
-default_enabled: true
diff --git a/config/feature_flags/development/allow_editing_commit_messages.yml b/config/feature_flags/development/get_tag_signatures.yml
index 74f67647cb5..e0d7d5d6dcf 100644
--- a/config/feature_flags/development/allow_editing_commit_messages.yml
+++ b/config/feature_flags/development/get_tag_signatures.yml
@@ -1,8 +1,8 @@
 ---
-name: allow_editing_commit_messages
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49152/
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/290779
-milestone: '13.7'
+name: get_tag_signatures
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67000
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337842
+milestone: '14.2'
 type: development
-group:
+group: group::gitaly
 default_enabled: false
diff --git a/config/feature_flags/development/gitaly_backup.yml b/config/feature_flags/development/gitaly_backup.yml
index 4f7a0a4baf9..67552d39d92 100644
--- a/config/feature_flags/development/gitaly_backup.yml
+++ b/config/feature_flags/development/gitaly_backup.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333034
 milestone: '14.0'
 type: development
 group: group::gitaly
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/github_review_importer_query_only_unimported_merge_requests.yml b/config/feature_flags/development/github_review_importer_query_only_unimported_merge_requests.yml
deleted file mode 100644
index 511b9a6a2ec..00000000000
--- a/config/feature_flags/development/github_review_importer_query_only_unimported_merge_requests.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: github_review_importer_query_only_unimported_merge_requests
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62036
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332982
-milestone: '14.0'
-type: development
-group: group::import
-default_enabled: true
diff --git a/config/feature_flags/development/graphql_board_lists.yml b/config/feature_flags/development/graphql_board_lists.yml
index a107dce7dfa..0a7578f4063 100644
--- a/config/feature_flags/development/graphql_board_lists.yml
+++ b/config/feature_flags/development/graphql_board_lists.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/248908
 milestone: '13.4'
 type: development
 group: group::project management
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/graphql_pipeline_details.yml b/config/feature_flags/development/graphql_pipeline_details.yml
deleted file mode 100644
index 57b32c55da3..00000000000
--- a/config/feature_flags/development/graphql_pipeline_details.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: graphql_pipeline_details
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46380
-rollout_issue_url:
-type: development
-group: group::pipeline authoring
-default_enabled: true
-milestone: '13.6'
diff --git a/config/feature_flags/development/import_redis_increment_by.yml b/config/feature_flags/development/import_redis_increment_by.yml
new file mode 100644
index 00000000000..bc2e5f97860
--- /dev/null
+++ b/config/feature_flags/development/import_redis_increment_by.yml
@@ -0,0 +1,8 @@
+---
+name: import_redis_increment_by
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65773
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336226
+milestone: '14.1'
+type: development
+group: group::import
+default_enabled: false
diff --git a/config/feature_flags/development/jira_issue_details_edit_labels.yml b/config/feature_flags/development/jira_issue_details_edit_labels.yml
index bccd7374907..c43d01bf969 100644
--- a/config/feature_flags/development/jira_issue_details_edit_labels.yml
+++ b/config/feature_flags/development/jira_issue_details_edit_labels.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65298
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335069
 milestone: '14.1'
 type: development
-group: group::ecosystem
+group: group::integrations
 default_enabled: false
diff --git a/config/feature_flags/development/jira_issue_details_edit_status.yml b/config/feature_flags/development/jira_issue_details_edit_status.yml
index 9d64707a79f..311e243c570 100644
--- a/config/feature_flags/development/jira_issue_details_edit_status.yml
+++ b/config/feature_flags/development/jira_issue_details_edit_status.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60092
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330628
 milestone: '14.1'
 type: development
-group: group::ecosystem
+group: group::integrations
 default_enabled: false
diff --git a/config/feature_flags/development/linear_project_ancestors.yml b/config/feature_flags/development/linear_project_ancestors.yml
new file mode 100644
index 00000000000..28c8fbcbf59
--- /dev/null
+++ b/config/feature_flags/development/linear_project_ancestors.yml
@@ -0,0 +1,8 @@
+---
+name: linear_project_ancestors
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68072
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338403
+milestone: '14.2'
+type: development
+group: group::access
+default_enabled: false
diff --git a/config/feature_flags/development/load_balancing_for_deployments_hooks_worker.yml b/config/feature_flags/development/load_balancing_for_deployments_hooks_worker.yml
new file mode 100644
index 00000000000..fe6dbca3dd4
--- /dev/null
+++ b/config/feature_flags/development/load_balancing_for_deployments_hooks_worker.yml
@@ -0,0 +1,8 @@
+---
+name: load_balancing_for_deployments_hooks_worker
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67878
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338342
+milestone: '14.2'
+type: development
+group: group::release
+default_enabled: false
diff --git a/config/feature_flags/development/load_balancing_for_export_workers.yml b/config/feature_flags/development/load_balancing_for_export_workers.yml
new file mode 100644
index 00000000000..04ebd8b4a04
--- /dev/null
+++ b/config/feature_flags/development/load_balancing_for_export_workers.yml
@@ -0,0 +1,8 @@
+---
+name: load_balancing_for_export_workers
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68153
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338615
+milestone: '14.2'
+type: development
+group: group::import
+default_enabled: false
diff --git a/config/feature_flags/development/load_balancing_refine_load_balancer_methods.yml b/config/feature_flags/development/load_balancing_refine_load_balancer_methods.yml
deleted file mode 100644
index bef59588f7a..00000000000
--- a/config/feature_flags/development/load_balancing_refine_load_balancer_methods.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: load_balancing_refine_load_balancer_methods
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65356
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335109
-milestone: '14.1'
-type: development
-group: group::memory
-default_enabled: false
diff --git a/config/feature_flags/development/merge_request_draft_filter.yml b/config/feature_flags/development/merge_request_show_render_cached.yml
index 3c08e0304d2..04a18b2f557 100644
--- a/config/feature_flags/development/merge_request_draft_filter.yml
+++ b/config/feature_flags/development/merge_request_show_render_cached.yml
@@ -1,8 +1,8 @@
 ---
-name: merge_request_draft_filter
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35942
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/298776
-milestone: '13.3'
+name: merge_request_show_render_cached
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65217
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335938
+milestone: '14.2'
 type: development
 group: group::code review
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/development/milestone_reference_pattern.yml b/config/feature_flags/development/milestone_reference_pattern.yml
new file mode 100644
index 00000000000..8ca4ae4c395
--- /dev/null
+++ b/config/feature_flags/development/milestone_reference_pattern.yml
@@ -0,0 +1,8 @@
+---
+name: milestone_reference_pattern
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65847
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336268
+milestone: '14.1'
+type: development
+group: group::source code
+default_enabled: false
diff --git a/config/feature_flags/development/partition_pruning_dry_run.yml b/config/feature_flags/development/optimize_safe_find_or_create_by.yml
index 427afa5fc94..6adedb5cece 100644
--- a/config/feature_flags/development/partition_pruning_dry_run.yml
+++ b/config/feature_flags/development/optimize_safe_find_or_create_by.yml
@@ -1,8 +1,8 @@
 ---
-name: partition_pruning_dry_run
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65093
+name: optimize_safe_find_or_create_by
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68458
 rollout_issue_url: 
-milestone: '14.1'
+milestone: '14.3'
 type: development
 group: group::database
 default_enabled: false
diff --git a/config/feature_flags/development/package_details_apollo.yml b/config/feature_flags/development/package_details_apollo.yml
index aa8ee47df0c..fbab4c2c7c8 100644
--- a/config/feature_flags/development/package_details_apollo.yml
+++ b/config/feature_flags/development/package_details_apollo.yml
@@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334786
 milestone: '14.1'
 type: development
 group: group::package
-default_enabled: false
+default_enabled: true
diff --git a/config/feature_flags/development/fetch_remote_params.yml b/config/feature_flags/development/packages_nuget_new_package_file_updater.yml
index db6b1a1775d..b1f8a79da9a 100644
--- a/config/feature_flags/development/fetch_remote_params.yml
+++ b/config/feature_flags/development/packages_nuget_new_package_file_updater.yml
@@ -1,8 +1,8 @@
 ---
-name: fetch_remote_params
+name: packages_nuget_new_package_file_updater
 introduced_by_url:
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/325528
-milestone: '13.12'
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336511
+milestone: '14.2'
 type: development
-group: group::gitaly
+group: group::package
 default_enabled: true
diff --git a/config/feature_flags/development/allow_archive_as_web_access_format.yml b/config/feature_flags/development/pages_smart_check_outdated_sha.yml
index 8f5d8101316..528d357f65c 100644
--- a/config/feature_flags/development/allow_archive_as_web_access_format.yml
+++ b/config/feature_flags/development/pages_smart_check_outdated_sha.yml
@@ -1,8 +1,8 @@
 ---
-name: allow_archive_as_web_access_format
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64471
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334944
-milestone: '14.1'
+name: pages_smart_check_outdated_sha
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67303
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336574
+milestone: '14.2'
 type: development
 group: group::release
 default_enabled: false
diff --git a/config/feature_flags/development/merge_request_cached_merge_pipeline_serializer.yml b/config/feature_flags/development/paginated_tree_graphql_query.yml
index 506e59f001b..13096412f25 100644
--- a/config/feature_flags/development/merge_request_cached_merge_pipeline_serializer.yml
+++ b/config/feature_flags/development/paginated_tree_graphql_query.yml
@@ -1,8 +1,8 @@
 ---
-name: merge_request_cached_merge_pipeline_serializer
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57827
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326317
-milestone: '13.11'
+name: paginated_tree_graphql_query
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66751
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337214
+milestone: '14.2'
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/partition_pruning.yml b/config/feature_flags/development/partition_pruning.yml
new file mode 100644
index 00000000000..02f5dc968a4
--- /dev/null
+++ b/config/feature_flags/development/partition_pruning.yml
@@ -0,0 +1,8 @@
+---
+name: partition_pruning
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67056
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337153
+milestone: '14.2'
+type: development
+group: group::database
+default_enabled: false
diff --git a/config/feature_flags/development/pipeline_graph_layers_view.yml b/config/feature_flags/development/pipeline_graph_layers_view.yml
deleted file mode 100644
index 49f24c00fd3..00000000000
--- a/config/feature_flags/development/pipeline_graph_layers_view.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: pipeline_graph_layers_view
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56865
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/328538
-milestone: '13.11'
-type: development
-group: group::pipeline authoring
-default_enabled: true
diff --git a/config/feature_flags/development/ci_build_metadata_config.yml b/config/feature_flags/development/pipeline_source_filter.yml
index 774b3f8fdc7..be24f6936e4 100644
--- a/config/feature_flags/development/ci_build_metadata_config.yml
+++ b/config/feature_flags/development/pipeline_source_filter.yml
@@ -1,8 +1,8 @@
 ---
-name: ci_build_metadata_config
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/7238
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/330954
-milestone: '11.7'
+name: pipeline_source_filter
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67846
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338347
+milestone: '14.2'
 type: development
 group: group::pipeline execution
 default_enabled: false
diff --git a/config/feature_flags/development/preload_associations_jobs_request_api_endpoint.yml b/config/feature_flags/development/preload_associations_jobs_request_api_endpoint.yml
deleted file mode 100644
index cafe1485658..00000000000
--- a/config/feature_flags/development/preload_associations_jobs_request_api_endpoint.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: preload_associations_jobs_request_api_endpoint
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57694
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/326477
-milestone: "13.11"
-type: development
-group: group::pipeline execution
-default_enabled: true
diff --git a/config/feature_flags/development/project_overwrite_service_tracking.yml b/config/feature_flags/development/project_overwrite_service_tracking.yml
new file mode 100644
index 00000000000..02c26d82654
--- /dev/null
+++ b/config/feature_flags/development/project_overwrite_service_tracking.yml
@@ -0,0 +1,8 @@
+---
+name: project_overwrite_service_tracking
+introduced_by_url:
+rollout_issue_url:
+milestone: '14.1'
+type: development
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/remove_composer_v1_cache_code.yml b/config/feature_flags/development/remove_composer_v1_cache_code.yml
new file mode 100644
index 00000000000..9654fc8dc54
--- /dev/null
+++ b/config/feature_flags/development/remove_composer_v1_cache_code.yml
@@ -0,0 +1,8 @@
+---
+name: remove_composer_v1_cache_code
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67843
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338264
+milestone: '14.2'
+type: development
+group: group::package
+default_enabled: false
diff --git a/config/feature_flags/development/report_on_long_redis_durations.yml b/config/feature_flags/development/report_on_long_redis_durations.yml
new file mode 100644
index 00000000000..0f93c591d63
--- /dev/null
+++ b/config/feature_flags/development/report_on_long_redis_durations.yml
@@ -0,0 +1,8 @@
+---
+name: report_on_long_redis_durations
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67512
+rollout_issue_url: https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1183
+milestone: '14.2'
+type: development
+group: team::Scalability
+default_enabled: false
diff --git a/config/feature_flags/development/runner_list_group_view_vue_ui.yml b/config/feature_flags/development/runner_list_group_view_vue_ui.yml
new file mode 100644
index 00000000000..3bda540ba5b
--- /dev/null
+++ b/config/feature_flags/development/runner_list_group_view_vue_ui.yml
@@ -0,0 +1,8 @@
+---
+name: runner_list_group_view_vue_ui
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66376
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336405
+milestone: '14.2'
+type: development
+group: group::runner
+default_enabled: false
diff --git a/config/feature_flags/development/runner_registration_control.yml b/config/feature_flags/development/runner_registration_control.yml
index 21edb90474d..56c01bf36e5 100644
--- a/config/feature_flags/development/runner_registration_control.yml
+++ b/config/feature_flags/development/runner_registration_control.yml
@@ -1,7 +1,7 @@
 ---
 name: runner_registration_control
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61407
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336087
 milestone: '14.1'
 type: development
 group: group::runner
diff --git a/config/feature_flags/development/search_sort_issues_by_popularity.yml b/config/feature_flags/development/search_sort_issues_by_popularity.yml
deleted file mode 100644
index 64885f00792..00000000000
--- a/config/feature_flags/development/search_sort_issues_by_popularity.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: search_sort_issues_by_popularity
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65231
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334974
-milestone: '14.1'
-type: development
-group: group::global search
-default_enabled: false
diff --git a/config/feature_flags/development/security_configuration_redesign.yml b/config/feature_flags/development/security_configuration_redesign.yml
deleted file mode 100644
index 16627191edc..00000000000
--- a/config/feature_flags/development/security_configuration_redesign.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: security_configuration_redesign
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62285
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331614
-milestone: '14.0'
-type: development
-group: group::static analysis
-default_enabled: false
diff --git a/config/feature_flags/development/security_configuration_redesign_ee.yml b/config/feature_flags/development/security_configuration_redesign_ee.yml
deleted file mode 100644
index bf981b65c7f..00000000000
--- a/config/feature_flags/development/security_configuration_redesign_ee.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: security_configuration_redesign_ee
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65171
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336077
-milestone: '14.1'
-type: development
-group: group::analyzer frontend
-default_enabled: false
diff --git a/config/feature_flags/development/list_commits.yml b/config/feature_flags/development/set_full_path.yml
index 45c2ff53d47..a2f249b60fd 100644
--- a/config/feature_flags/development/list_commits.yml
+++ b/config/feature_flags/development/set_full_path.yml
@@ -1,8 +1,8 @@
 ---
-name: list_commits
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65468
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335208
-milestone: '14.1'
+name: set_full_path
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66929
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337002
+milestone: '14.2'
 type: development
 group: group::gitaly
 default_enabled: false
diff --git a/config/feature_flags/development/similarity_search.yml b/config/feature_flags/development/similarity_search.yml
deleted file mode 100644
index 978095c94b5..00000000000
--- a/config/feature_flags/development/similarity_search.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: similarity_search
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37300/
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38675
-milestone: '13.3'
-type: development
-group: group::optimize
-default_enabled: true
diff --git a/config/feature_flags/development/cancel_pipelines_prior_to_destroy.yml b/config/feature_flags/development/specialized_service_for_project_member_auth_refresh.yml
index 9b3676b7bf3..2d0c4cf14c3 100644
--- a/config/feature_flags/development/cancel_pipelines_prior_to_destroy.yml
+++ b/config/feature_flags/development/specialized_service_for_project_member_auth_refresh.yml
@@ -1,8 +1,8 @@
 ---
-name: cancel_pipelines_prior_to_destroy
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65586
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335338
-milestone: '14.1'
+name: specialized_service_for_project_member_auth_refresh
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67477
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337730
+milestone: '14.2'
 type: development
-group: group::continuous integration
+group: group::access
 default_enabled: false
diff --git a/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml b/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml
new file mode 100644
index 00000000000..820e6cafb41
--- /dev/null
+++ b/config/feature_flags/development/specialized_worker_for_group_lock_update_auth_recalculation.yml
@@ -0,0 +1,8 @@
+---
+name: specialized_worker_for_group_lock_update_auth_recalculation
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66525
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/336592
+milestone: '14.2'
+type: development
+group: group::access
+default_enabled: false
diff --git a/config/feature_flags/development/store_mentions_without_subtransaction.yml b/config/feature_flags/development/store_mentions_without_subtransaction.yml
new file mode 100644
index 00000000000..a71aa204935
--- /dev/null
+++ b/config/feature_flags/development/store_mentions_without_subtransaction.yml
@@ -0,0 +1,8 @@
+---
+name: store_mentions_without_subtransaction
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68433
+rollout_issue_url: 
+milestone: '14.3'
+type: development
+group: group::project management
+default_enabled: false
diff --git a/config/feature_flags/development/update_remote_mirror_inmemory.yml b/config/feature_flags/development/update_remote_mirror_inmemory.yml
deleted file mode 100644
index 38c54c3cfc7..00000000000
--- a/config/feature_flags/development/update_remote_mirror_inmemory.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: update_remote_mirror_inmemory
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63962
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333517
-milestone: '14.0'
-type: development
-group: group::gitaly
-default_enabled: true
diff --git a/config/feature_flags/development/usage_data_i_testing_full_code_quality_report_total.yml b/config/feature_flags/development/usage_data_i_testing_full_code_quality_report_total.yml
deleted file mode 100644
index 38bce2529dd..00000000000
--- a/config/feature_flags/development/usage_data_i_testing_full_code_quality_report_total.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: usage_data_i_testing_full_code_quality_report_total
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49079
-rollout_issue_url:
-milestone: '13.8'
-type: development
-group: group::testing
-default_enabled: true
diff --git a/config/feature_flags/development/vuln_report_new_project_filter.yml b/config/feature_flags/development/vuln_report_new_project_filter.yml
new file mode 100644
index 00000000000..79c2afaca07
--- /dev/null
+++ b/config/feature_flags/development/vuln_report_new_project_filter.yml
@@ -0,0 +1,8 @@
+---
+name: vuln_report_new_project_filter
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55745
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334380
+milestone: '14.2'
+type: development
+group: group::threat insights
+default_enabled: false
diff --git a/config/feature_flags/development/vulnerability_finding_replace_metadata.yml b/config/feature_flags/development/vulnerability_finding_replace_metadata.yml
new file mode 100644
index 00000000000..f7b3cb67c38
--- /dev/null
+++ b/config/feature_flags/development/vulnerability_finding_replace_metadata.yml
@@ -0,0 +1,7 @@
+---
+name: vulnerability_finding_replace_metadata
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66868
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337253
+group: group::threat insights
+type: development
+default_enabled: false
\ No newline at end of file
diff --git a/config/feature_flags/development/web_hooks_disable_failed.yml b/config/feature_flags/development/web_hooks_disable_failed.yml
index a54034d73e8..3a7c85edafc 100644
--- a/config/feature_flags/development/web_hooks_disable_failed.yml
+++ b/config/feature_flags/development/web_hooks_disable_failed.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60837
 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/329849
 milestone: '13.12'
 type: development
-group: group::ecosystem
+group: group::integrations
 default_enabled: false
diff --git a/config/feature_flags/experiment/force_company_trial.yml b/config/feature_flags/experiment/force_company_trial.yml
new file mode 100644
index 00000000000..85fc789085d
--- /dev/null
+++ b/config/feature_flags/experiment/force_company_trial.yml
@@ -0,0 +1,8 @@
+---
+name: force_company_trial
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65287
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335050
+milestone: '14.1'
+type: experiment
+group: group::adoption
+default_enabled: false
diff --git a/config/feature_flags/experiment/invite_members_empty_group_version_a_experiment_percentage.yml b/config/feature_flags/experiment/invite_email_preview_text.yml
index 6f8186a6888..fcb4cda0b14 100644
--- a/config/feature_flags/experiment/invite_members_empty_group_version_a_experiment_percentage.yml
+++ b/config/feature_flags/experiment/invite_email_preview_text.yml
@@ -1,8 +1,8 @@
 ---
-name: invite_members_empty_group_version_a_experiment_percentage
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45689
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/280
-milestone: '13.6'
+name: invite_email_preview_text
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67236
+rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/421
+milestone: '14.2'
 type: experiment
 group: group::expansion
 default_enabled: false
diff --git a/config/feature_flags/experiment/members_invite_email.yml b/config/feature_flags/experiment/member_areas_of_focus.yml
index 5bf0b9d10d0..e728ee7e3d3 100644
--- a/config/feature_flags/experiment/members_invite_email.yml
+++ b/config/feature_flags/experiment/member_areas_of_focus.yml
@@ -1,8 +1,8 @@
 ---
-name: members_invite_email
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51223
-rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/325
-milestone: '13.9'
+name: member_areas_of_focus
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65273
+rollout_issue_url: https://gitlab.com/gitlab-org/growth/team-tasks/-/issues/406
+milestone: '14.2'
 type: experiment
 group: group::expansion
 default_enabled: false
diff --git a/config/feature_flags/ops/active_record_subtransactions_counter.yml b/config/feature_flags/ops/active_record_subtransactions_counter.yml
new file mode 100644
index 00000000000..0d2b1b0c84a
--- /dev/null
+++ b/config/feature_flags/ops/active_record_subtransactions_counter.yml
@@ -0,0 +1,8 @@
+---
+name: active_record_subtransactions_counter
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66477
+rollout_issue_url:
+milestone: '14.1'
+type: ops
+group: group::pipeline execution
+default_enabled: false
diff --git a/config/feature_flags/development/prevent_retry_of_retried_jobs.yml b/config/feature_flags/ops/active_record_transactions_tracking.yml
index d55032e0502..37bc76b3cf8 100644
--- a/config/feature_flags/development/prevent_retry_of_retried_jobs.yml
+++ b/config/feature_flags/ops/active_record_transactions_tracking.yml
@@ -1,8 +1,8 @@
 ---
-name: prevent_retry_of_retried_jobs
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62349
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331695
-milestone: '14.0'
-type: development
+name: active_record_transactions_tracking
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67918
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338306
+milestone: '14.2'
+type: ops
 group: group::pipeline execution
-default_enabled: true
+default_enabled: false
diff --git a/config/feature_flags/ops/api_kaminari_count_with_limit.yml b/config/feature_flags/ops/api_kaminari_count_with_limit.yml
index a987d5c65b1..a55e3e67710 100644
--- a/config/feature_flags/ops/api_kaminari_count_with_limit.yml
+++ b/config/feature_flags/ops/api_kaminari_count_with_limit.yml
@@ -4,5 +4,5 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23
 rollout_issue_url: 
 milestone: '11.8'
 type: ops
-group: group::ecosystem
+group: group::integrations
 default_enabled: false
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index f63c42be6ee..f7b1c2f7567 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -33,6 +33,10 @@ production: &base
     host: localhost
     port: 80 # Set to 443 if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
     https: false # Set to true if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
+
+    # Uncomment this line if you want to configure the Rails asset host for a CDN.
+    # cdn_host: localhost
+
     # The maximum time Puma can spend on the request. This needs to be smaller than the worker timeout.
     # Default is 95% of the worker timeout
     max_request_duration_seconds: 57
@@ -114,6 +118,8 @@ production: &base
       # ca_certs_file: /home/git/gitlab/.gitlab_smime_ca_certs
 
     # Email server smtp settings are in config/initializers/smtp_settings.rb.sample
+    # File location to read encrypted SMTP secrets from
+    # email_smtp_secret_file: /mnt/gitlab/smtp.yaml.enc # Default: shared/encrypted_settings/smtp.yaml.enc
 
     # default_can_create_group: false  # default: true
     # username_changing_enabled: false # default: true - User can change their username/namespace
@@ -470,6 +476,9 @@ production: &base
     # Stop expired environments
     environments_auto_stop_cron_worker:
       cron: "24 * * * *"
+    # Delete stopped environments
+    environments_auto_delete_cron_worker:
+      cron: "34 * * * *"
     # Periodically run 'git fsck' on all repositories. If started more than
     # once per hour you will have concurrent 'git fsck' jobs.
     repository_check_worker:
diff --git a/config/helpers/is_jh_env.js b/config/helpers/is_jh_env.js
new file mode 100644
index 00000000000..10251d3166e
--- /dev/null
+++ b/config/helpers/is_jh_env.js
@@ -0,0 +1,16 @@
+const fs = require('fs');
+const path = require('path');
+const IS_EE = require('./is_ee_env');
+
+const ROOT_PATH = path.resolve(__dirname, '../..');
+
+// The `FOSS_ONLY` is always `string` or `nil`
+// Thus the nil or empty string will result
+// in using default value: false
+//
+// The behavior needs to be synchronised with
+// lib/gitlab.rb: Gitlab.jh?
+// Since IS_EE already satisifies the conditions of not being a FOSS_ONLY.
+// const isFossOnly = JSON.parse(process.env.FOSS_ONLY || 'false');
+const isEEOnly = JSON.parse(process.env.EE_ONLY || 'false');
+module.exports = IS_EE && !isEEOnly && fs.existsSync(path.join(ROOT_PATH, 'jh'));
diff --git a/config/initializers/00_rails_disable_joins.rb b/config/initializers/00_rails_disable_joins.rb
new file mode 100644
index 00000000000..4274365ccad
--- /dev/null
+++ b/config/initializers/00_rails_disable_joins.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Backported from Rails 7.0
+# Initial support for has_many :through was implemented in https://github.com/rails/rails/pull/41937
+# Support for has_one :through was implemented in https://github.com/rails/rails/pull/42079
+raise 'DisableJoins patch is only to be used with versions of Rails < 7.0' unless Rails::VERSION::MAJOR < 7
+
+ActiveRecord::Associations::Association.prepend(GemExtensions::ActiveRecord::Association)
+# Temporarily allow :disable_joins to accept a lambda argument, to control rollout with feature flags
+ActiveRecord::Associations::Association.prepend(GemExtensions::ActiveRecord::ConfigurableDisableJoins)
+ActiveRecord::Associations::Builder::HasOne.prepend(GemExtensions::ActiveRecord::Associations::Builder::HasOne)
+ActiveRecord::Associations::Builder::HasMany.prepend(GemExtensions::ActiveRecord::Associations::Builder::HasMany)
+ActiveRecord::Associations::HasOneThroughAssociation.prepend(GemExtensions::ActiveRecord::Associations::HasOneThroughAssociation)
+ActiveRecord::Associations::HasManyThroughAssociation.prepend(GemExtensions::ActiveRecord::Associations::HasManyThroughAssociation)
+ActiveRecord::Associations::Preloader::ThroughAssociation.prepend(GemExtensions::ActiveRecord::Associations::Preloader::ThroughAssociation)
+ActiveRecord::Base.extend(GemExtensions::ActiveRecord::DelegateCache)
diff --git a/config/initializers/0_inject_enterprise_edition_module.rb b/config/initializers/0_inject_enterprise_edition_module.rb
index ea3fbda9186..a00075990eb 100644
--- a/config/initializers/0_inject_enterprise_edition_module.rb
+++ b/config/initializers/0_inject_enterprise_edition_module.rb
@@ -64,7 +64,31 @@ module InjectEnterpriseEditionModule
     # After we moved everything over to zeitwerk we can avoid rescuing
     # NameError and just check if const_defined?
     # mod && mod.const_defined?(name, false) && mod.const_get(name, false)
-    mod && mod.const_get(name, false)
+    result = mod && mod.const_get(name, false)
+
+    if result.name == "#{mod}::#{name}"
+      result
+    else
+      # This may hit into a Rails issue that when we try to load
+      # `EE::API::Appearance`, Rails might load `::Appearance` the first time
+      # when `mod.const_get(name, false)` is called if `::Appearance` is not
+      # loaded yet. This can be demonstrated as the following:
+      #
+      #     EE.const_get('API::Appearance', false) # => Appearance
+      #     EE.const_get('API::Appearance', false) # => raise NameError
+      #
+      # Getting a `NameError` is what we're expecting here, because
+      # `EE::API::Appearance` doesn't exist.
+      #
+      # This is because Rails will attempt to load constants from all the
+      # parent namespaces, and if it finds one it'll load it and return it.
+      # However, the second time when it's called, since the top-level class
+      # is already loaded, then Rails will skip this process. This weird
+      # behaviour can be worked around by calling this the second time.
+      # The particular line is at:
+      # https://github.com/rails/rails/blob/v6.1.3.2/activesupport/lib/active_support/dependencies.rb#L569-L570
+      mod.const_get(name, false)
+    end
   rescue NameError
     false
   end
diff --git a/config/initializers/0_log_deprecations.rb b/config/initializers/0_log_deprecations.rb
new file mode 100644
index 00000000000..20fb5144937
--- /dev/null
+++ b/config/initializers/0_log_deprecations.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+def log_deprecations?
+  via_env_var = Gitlab::Utils.to_boolean(ENV['GITLAB_LOG_DEPRECATIONS'])
+  # enable by default during development unless explicitly turned off
+  via_env_var.nil? ? Rails.env.development? : via_env_var
+end
+
+if log_deprecations?
+  # Log deprecation warnings emitted through Kernel#warn, such as from gems or
+  # the Ruby VM.
+  Warning.process(/.+is deprecated$/) do |warning|
+    Gitlab::DeprecationJsonLogger.info(message: warning.strip, source: 'ruby')
+    # Returning :default means we continue emitting this to stderr as well.
+    :default
+  end
+
+  # Log deprecation warnings emitted from Rails (see ActiveSupport::Deprecation).
+  ActiveSupport::Notifications.subscribe('deprecation.rails') do |name, start, finish, id, payload|
+    Gitlab::DeprecationJsonLogger.info(message: payload[:message].strip, source: 'rails')
+  end
+end
diff --git a/config/initializers/1_postgresql_only.rb b/config/initializers/1_postgresql_only.rb
index 415fc6f2cae..7bb851daa08 100644
--- a/config/initializers/1_postgresql_only.rb
+++ b/config/initializers/1_postgresql_only.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 raise "PostgreSQL is the only supported database from GitLab 12.1" unless
-  Gitlab::Database.postgresql?
+  Gitlab::Database.main.postgresql?
 
 Gitlab::Database.check_postgres_version_and_print_warning
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 42c7063378b..e71f1e1b028 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -164,6 +164,7 @@ Settings.gitlab['default_branch_protection'] ||= 2
 Settings.gitlab['default_can_create_group'] = true if Settings.gitlab['default_can_create_group'].nil?
 Settings.gitlab['default_theme'] = Gitlab::Themes::APPLICATION_DEFAULT if Settings.gitlab['default_theme'].nil?
 Settings.gitlab['host'] ||= ENV['GITLAB_HOST'] || 'localhost'
+Settings.gitlab['cdn_host'] ||= ENV['GITLAB_CDN_HOST'].presence
 Settings.gitlab['ssh_host'] ||= Settings.gitlab.host
 Settings.gitlab['https']        = false if Settings.gitlab['https'].nil?
 Settings.gitlab['port']       ||= ENV['GITLAB_PORT'] || (Settings.gitlab.https ? 443 : 80)
@@ -177,6 +178,7 @@ Settings.gitlab['email_display_name'] ||= ENV['GITLAB_EMAIL_DISPLAY_NAME'] || 'G
 Settings.gitlab['email_reply_to'] ||= ENV['GITLAB_EMAIL_REPLY_TO'] || "noreply@#{Settings.gitlab.host}"
 Settings.gitlab['email_subject_suffix'] ||= ENV['GITLAB_EMAIL_SUBJECT_SUFFIX'] || ""
 Settings.gitlab['email_smime'] = SmimeSignatureSettings.parse(Settings.gitlab['email_smime'])
+Settings.gitlab['email_smtp_secret_file'] = Settings.absolute(Settings.gitlab['email_smtp_secret_file'] || File.join(Settings.encrypted_settings['path'], "smtp.yaml.enc"))
 Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url)
 Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url)
 Settings.gitlab['user'] ||= 'git'
@@ -209,7 +211,7 @@ Settings.gitlab.default_projects_features['visibility_level']   = Settings.__sen
 Settings.gitlab['domain_allowlist'] ||= []
 Settings.gitlab['import_sources'] ||= Gitlab::ImportSources.values
 Settings.gitlab['trusted_proxies'] ||= []
-Settings.gitlab['content_security_policy'] ||= Gitlab::ContentSecurityPolicy::ConfigLoader.default_settings_hash
+Settings.gitlab['content_security_policy'] ||= {}
 Settings.gitlab['allowed_hosts'] ||= []
 Settings.gitlab['no_todos_messages'] ||= YAML.load_file(Rails.root.join('config', 'no_todos_messages.yml'))
 Settings.gitlab['impersonation_enabled'] ||= true if Settings.gitlab['impersonation_enabled'].nil?
@@ -444,6 +446,9 @@ Settings.cron_jobs['ci_schedule_delete_objects_worker']['job_class'] = 'Ci::Sche
 Settings.cron_jobs['environments_auto_stop_cron_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['environments_auto_stop_cron_worker']['cron'] ||= '24 * * * *'
 Settings.cron_jobs['environments_auto_stop_cron_worker']['job_class'] = 'Environments::AutoStopCronWorker'
+Settings.cron_jobs['environments_auto_delete_cron_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['environments_auto_delete_cron_worker']['cron'] ||= '34 * * * *'
+Settings.cron_jobs['environments_auto_delete_cron_worker']['job_class'] = 'Environments::AutoDeleteCronWorker'
 Settings.cron_jobs['repository_check_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['repository_check_worker']['cron'] ||= '20 * * * *'
 Settings.cron_jobs['repository_check_worker']['job_class'] = 'RepositoryCheck::DispatchWorker'
@@ -543,6 +548,9 @@ Settings.cron_jobs['update_container_registry_info_worker']['job_class'] = 'Upda
 Settings.cron_jobs['postgres_dynamic_partitions_manager'] ||= Settingslogic.new({})
 Settings.cron_jobs['postgres_dynamic_partitions_manager']['cron'] ||= '21 */6 * * *'
 Settings.cron_jobs['postgres_dynamic_partitions_manager']['job_class'] ||= 'Database::PartitionManagementWorker'
+Settings.cron_jobs['postgres_dynamic_partitions_dropper'] ||= Settingslogic.new({})
+Settings.cron_jobs['postgres_dynamic_partitions_dropper']['cron'] ||= '45 12 * * *'
+Settings.cron_jobs['postgres_dynamic_partitions_dropper']['job_class'] ||= 'Database::DropDetachedPartitionsWorker'
 Settings.cron_jobs['ci_platform_metrics_update_cron_worker'] ||= Settingslogic.new({})
 Settings.cron_jobs['ci_platform_metrics_update_cron_worker']['cron'] ||= '47 9 * * *'
 Settings.cron_jobs['ci_platform_metrics_update_cron_worker']['job_class'] = 'CiPlatformMetricsUpdateCronWorker'
@@ -701,6 +709,9 @@ Gitlab.ee do
   Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker'] ||= Settingslogic.new({})
   Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker']['cron'] ||= '*/15 * * * *'
   Settings.cron_jobs['security_orchestration_policy_rule_schedule_worker']['job_class'] = 'Security::OrchestrationPolicyRuleScheduleWorker'
+  Settings.cron_jobs['app_sec_dast_profile_schedule_worker'] ||= Settingslogic.new({})
+  Settings.cron_jobs['app_sec_dast_profile_schedule_worker']['cron'] ||= '7-59/15 * * * *'
+  Settings.cron_jobs['app_sec_dast_profile_schedule_worker']['job_class'] = 'AppSec::Dast::ProfileScheduleWorker'
 end
 
 #
@@ -750,13 +761,6 @@ Settings.gitlab_kas['internal_url'] ||= 'grpc://localhost:8153'
 #
 Settings['repositories'] ||= Settingslogic.new({})
 Settings.repositories['storages'] ||= {}
-unless Settings.repositories.storages['default']
-  Settings.repositories.storages['default'] ||= {}
-  # We set the path only if the default storage doesn't exist, in case it exists
-  # but follows the pre-9.0 configuration structure. `6_validations.rb` initializer
-  # will validate all storages and throw a relevant error to the user if necessary.
-  Settings.repositories.storages['default']['path'] ||= Settings.gitlab['user_home'] + '/repositories/'
-end
 
 Settings.repositories.storages.each do |key, storage|
   Settings.repositories.storages[key] = Gitlab::GitalyClient::StorageSettings.new(storage)
diff --git a/config/initializers/2_gitlab.rb b/config/initializers/2_gitlab.rb
deleted file mode 100644
index 5b78a471f8a..00000000000
--- a/config/initializers/2_gitlab.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency 'gitlab'
diff --git a/config/initializers/active_record_build_select.rb b/config/initializers/active_record_build_select.rb
index 48f1b1ee407..ab5a872cac6 100644
--- a/config/initializers/active_record_build_select.rb
+++ b/config/initializers/active_record_build_select.rb
@@ -9,10 +9,6 @@
 # statement cache. If a different migration is then run and one of these columns is
 # removed in the meantime, the query is invalid.
 
-ActiveRecord::Base.class_eval do
-  class_attribute :enumerate_columns_in_select_statements
-end
-
 module ActiveRecord
   module QueryMethods
     private
@@ -20,8 +16,6 @@ module ActiveRecord
     def build_select(arel)
       if select_values.any?
         arel.project(*arel_columns(select_values.uniq))
-      elsif klass.enumerate_columns_in_select_statements
-        arel.project(*klass.column_names.map { |field| table[field] })
       else
         arel.project(@klass.arel_table[Arel.star])
       end
diff --git a/config/initializers/active_record_lifecycle.rb b/config/initializers/active_record_lifecycle.rb
index 4d63ffaf711..75991c9da35 100644
--- a/config/initializers/active_record_lifecycle.rb
+++ b/config/initializers/active_record_lifecycle.rb
@@ -14,7 +14,7 @@ end
 
 if defined?(ActiveRecord::Base)
   Gitlab::Cluster::LifecycleEvents.on_before_fork do
-    raise 'ActiveRecord connection not established. Unable to start.' unless Gitlab::Database.exists?
+    raise 'ActiveRecord connection not established. Unable to start.' unless Gitlab::Database.main.exists?
 
     # the following is highly recommended for Rails + "preload_app true"
     # as there's no need for the master process to hold a connection
diff --git a/config/initializers/active_record_transaction_observer.rb b/config/initializers/active_record_transaction_observer.rb
new file mode 100644
index 00000000000..fc9b73d656e
--- /dev/null
+++ b/config/initializers/active_record_transaction_observer.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+return unless Gitlab.com? || Gitlab.dev_or_test_env?
+
+def feature_flags_available?
+  # When the DBMS is not available, an exception (e.g. PG::ConnectionBad) is raised
+  active_db_connection = ActiveRecord::Base.connection.active? rescue false
+
+  active_db_connection && Feature::FlipperFeature.table_exists?
+rescue ActiveRecord::NoDatabaseError
+  false
+end
+
+Gitlab::Application.configure do
+  if feature_flags_available? && ::Feature.enabled?(:active_record_transactions_tracking, type: :ops, default_enabled: :yaml)
+    Gitlab::Database::Transaction::Observer.register!
+  end
+end
diff --git a/config/initializers/active_record_transaction_patches.rb b/config/initializers/active_record_transaction_patches.rb
new file mode 100644
index 00000000000..bf92ec73c80
--- /dev/null
+++ b/config/initializers/active_record_transaction_patches.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+if ENV['ACTIVE_RECORD_DISABLE_TRANSACTION_METRICS_PATCHES'].blank?
+  Gitlab::Database.install_transaction_metrics_patches!
+end
+
+return unless Gitlab.com? || Gitlab.dev_or_test_env?
+
+if ENV['ACTIVE_RECORD_DISABLE_TRANSACTION_CONTEXT_PATCHES'].blank?
+  Gitlab::Database.install_transaction_context_patches!
+end
diff --git a/config/initializers/check_decomposition_database_config.rb b/config/initializers/check_decomposition_database_config.rb
deleted file mode 100644
index f32c72efa75..00000000000
--- a/config/initializers/check_decomposition_database_config.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-ci_db_config = Gitlab::Application.config.database_configuration[Rails.env]["ci"]
-
-if ci_db_config.present?
-  raise "migrations_paths setting for ci database must be `db/ci_migrate`" unless ci_db_config["migrations_paths"] == 'db/ci_migrate'
-end
diff --git a/config/initializers/console_message.rb b/config/initializers/console_message.rb
index 2c05c2c9a24..5e9e7a7a9af 100644
--- a/config/initializers/console_message.rb
+++ b/config/initializers/console_message.rb
@@ -10,8 +10,8 @@ if Gitlab::Runtime.console?
   puts " GitLab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab.revision}) #{Gitlab.ee? ? 'EE' : 'FOSS'}"
   puts " GitLab Shell:".ljust(justify) + "#{Gitlab::VersionInfo.parse(Gitlab::Shell.version)}"
 
-  if Gitlab::Database.exists?
-    puts " #{Gitlab::Database.human_adapter_name}:".ljust(justify) + Gitlab::Database.version
+  if Gitlab::Database.main.exists?
+    puts " #{Gitlab::Database.main.human_adapter_name}:".ljust(justify) + Gitlab::Database.main.version
 
     Gitlab.ee do
       if Gitlab::Geo.connected? && Gitlab::Geo.enabled?
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index c19fb65017f..3c6606066cd 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -2,11 +2,16 @@
 
 csp_settings = Settings.gitlab.content_security_policy
 
+csp_settings['enabled'] = Gitlab::ContentSecurityPolicy::ConfigLoader.default_enabled if csp_settings['enabled'].nil?
+csp_settings['report_only'] = false if csp_settings['report_only'].nil?
+csp_settings['directives'] ||= {}
+
 if csp_settings['enabled']
+  csp_settings['directives'] = ::Gitlab::ContentSecurityPolicy::ConfigLoader.default_directives if csp_settings['directives'].empty?
+
   # See https://guides.rubyonrails.org/security.html#content-security-policy
   Rails.application.config.content_security_policy do |policy|
-    directives = csp_settings.fetch('directives', {})
-    loader = ::Gitlab::ContentSecurityPolicy::ConfigLoader.new(directives)
+    loader = ::Gitlab::ContentSecurityPolicy::ConfigLoader.new(csp_settings['directives'].to_h)
     loader.load(policy)
   end
 
diff --git a/config/initializers/database_config.rb b/config/initializers/database_config.rb
index 6637080c038..6bdd0e377da 100644
--- a/config/initializers/database_config.rb
+++ b/config/initializers/database_config.rb
@@ -20,15 +20,11 @@ Gitlab.ee do
   end
 end
 
-db_config = Gitlab::Database.config ||
-            Rails.application.config.database_configuration[Rails.env]
-
-db_config['pool'] = Gitlab::Database.default_pool_size
-ActiveRecord::Base.establish_connection(db_config)
+ActiveRecord::Base.establish_connection(Gitlab::Database.main.db_config_with_default_pool_size)
 
 Gitlab.ee do
   if Gitlab::Runtime.sidekiq? && Gitlab::Geo.geo_database_configured?
-    Rails.configuration.geo_database['pool'] = Gitlab::Database.default_pool_size
+    Rails.configuration.geo_database['pool'] = Gitlab::Database.main.default_pool_size
     Geo::TrackingBase.establish_connection(Rails.configuration.geo_database)
   end
 end
diff --git a/config/initializers/forbid_sidekiq_in_transactions.rb b/config/initializers/forbid_sidekiq_in_transactions.rb
index 85ec8cad0a3..ba5c1340b10 100644
--- a/config/initializers/forbid_sidekiq_in_transactions.rb
+++ b/config/initializers/forbid_sidekiq_in_transactions.rb
@@ -20,7 +20,7 @@ module Sidekiq
       module NoEnqueueingFromTransactions
         %i(perform_async perform_at perform_in).each do |name|
           define_method(name) do |*args|
-            if !Sidekiq::Worker.skip_transaction_check && Gitlab::Database.inside_transaction?
+            if !Sidekiq::Worker.skip_transaction_check && Gitlab::Database.main.inside_transaction?
               begin
                 raise Sidekiq::Worker::EnqueueFromTransactionError, <<~MSG
                 `#{self}.#{name}` cannot be called inside a transaction as this can lead to
diff --git a/config/initializers/gitlab_experiment.rb b/config/initializers/gitlab_experiment.rb
index 40c706ea922..5582c642b3c 100644
--- a/config/initializers/gitlab_experiment.rb
+++ b/config/initializers/gitlab_experiment.rb
@@ -1,11 +1,64 @@
 # frozen_string_literal: true
 
 Gitlab::Experiment.configure do |config|
+  # The base experiment class that will be instantiated when using the
+  # `experiment` DSL, is our ApplicationExperiment. If a custom experiment
+  # class is resolvable by the experiment name, that will be instantiated
+  # instead -- which can then inherit from whatever else it wants to.
+  #
+  # Custom experiment classes can be defined in /app/experiments.
+  #
   config.base_class = 'ApplicationExperiment'
+
+  # Mount the engine and middleware at a gitlab friendly style path.
+  #
+  # The middleware currently focuses only on handling redirection logic, which
+  # is used for instrumenting urls in places where urls are otherwise not
+  # possible to instrument. Emails, and markdown content being among the top
+  # places where this can be useful.
+  #
   config.mount_at = '/-/experiment'
+
+  # We use a long lived redis cache to increase the performance of experiments.
+  #
+  # Experiments can implement exclusionary and segmentation logic that can be
+  # expensive, and so to better handle these cases, once a variant is assigned
+  # to a given context, it's "sticky" to that context. This cache check is one
+  # of the first things in the process of variant resolution, and so if one is
+  # cached, no further logic is executed in resolving variant assignment.
+  #
+  # This means that there's no easy way to currently move a context from one
+  # variant to another. Future tooling will make this easier, but implementing
+  # a custom cache for your experiment may be required in edge cases.
+  #
   config.cache = Gitlab::Experiment::Cache::RedisHashStore.new(
-    pool: ->(&block) { Gitlab::Redis::SharedState.with { |redis| block.call(redis) } }
+    pool: ->(&block) { Gitlab::Redis::SharedState.with(&block) }
   )
+
+  # The middleware instruments and redirects urls, but we don't want this to be
+  # exploited or used to send people from a trusted site to a nefarious one. So
+  # we validate urls before redirecting them.
+  #
+  # This behavior doesn't make perfect sense for self managed installs either,
+  # so we don't think we should redirect in those cases.
+  #
+  valid_domains = %w[about.gitlab.com docs.gitlab.com gitlab.com]
+  config.redirect_url_validator = lambda do |url|
+    Gitlab.dev_env_or_com? && (url = URI.parse(url)) && valid_domains.include?(url.host)
+  rescue URI::InvalidURIError
+    false
+  end
+
+  # Experiments are instrumented using an event based system by default. This
+  # can be overridden in your experiment by specifying a `#track` method.
+  #
+  # The basic behavior though, is to accept any details and pass them along to
+  # snowplow, with an included gitlab_experiment schema, that has various
+  # details about the experiment, like name and variant assignment.
+  #
+  # This uses the Gitlab::Tracking interface, so arbitrary event properties are
+  # permitted, and will be sent along using Gitlab::Tracking::StandardContext.
+  #
   config.tracking_behavior = lambda do |action, event_args|
     Gitlab::Tracking.event(name, action.to_s, **event_args.merge(
       context: (event_args[:context] || []) << SnowplowTracker::SelfDescribingJson.new(
diff --git a/config/initializers/load_balancing.rb b/config/initializers/load_balancing.rb
index f3c977893ba..2b58ae0f642 100644
--- a/config/initializers/load_balancing.rb
+++ b/config/initializers/load_balancing.rb
@@ -1,12 +1,19 @@
 # frozen_string_literal: true
 
+ActiveRecord::Base.singleton_class.attr_accessor :load_balancing_proxy
+
 if Gitlab::Database::LoadBalancing.enable?
-  Gitlab::Database.disable_prepared_statements
+  Gitlab::Database.main.disable_prepared_statements
 
   Gitlab::Application.configure do |config|
     config.middleware.use(Gitlab::Database::LoadBalancing::RackMiddleware)
   end
 
+  # This hijacks the "connection" method to ensure both
+  # `ActiveRecord::Base.connection` and all models use the same load
+  # balancing proxy.
+  ActiveRecord::Base.singleton_class.prepend(Gitlab::Database::LoadBalancing::ActiveRecordProxy)
+
   Gitlab::Database::LoadBalancing.configure_proxy
 
   # This needs to be executed after fork of clustered processes
diff --git a/config/initializers/rails_asset_host.rb b/config/initializers/rails_asset_host.rb
new file mode 100644
index 00000000000..6fa934f2bd1
--- /dev/null
+++ b/config/initializers/rails_asset_host.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+if Gitlab.config.gitlab.cdn_host.present?
+  Rails.application.configure do
+    config.after_initialize do
+      # Enable serving of images, stylesheets, and JavaScripts from an asset server
+      Rails.application.config.action_controller.asset_host = Gitlab.config.gitlab.cdn_host
+
+      # If ActionController::Base is called before this initializer, then we must set
+      # the configuration directly.
+      # See https://github.com/rails/rails/issues/16209
+      ActionController::Base.asset_host = Gitlab.config.gitlab.cdn_host
+    end
+  end
+end
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 530d7342d57..204d4d88f0a 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -27,5 +27,5 @@ Gitlab::Application.config.session_store(
   secure: Gitlab.config.gitlab.https,
   httponly: true,
   expires_in: Settings.gitlab['session_expire_delay'] * 60,
-  path: Rails.application.config.relative_url_root.nil? ? '/' : Gitlab::Application.config.relative_url_root
+  path: Rails.application.config.relative_url_root.presence || '/'
 )
diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample
index 4a50c29143d..eefc2253122 100644
--- a/config/initializers/smtp_settings.rb.sample
+++ b/config/initializers/smtp_settings.rb.sample
@@ -9,6 +9,7 @@
 
 if Rails.env.production?
   Rails.application.config.action_mailer.delivery_method = :smtp
+  secrets = Gitlab::Email::SmtpConfig.secrets
 
   ActionMailer::Base.delivery_method = :smtp
   ActionMailer::Base.smtp_settings = {
@@ -16,6 +17,10 @@ if Rails.env.production?
     port: 465,
     user_name: "smtp",
     password: "123456",
+    ## If you are using encrypted smtp credentials then you should instead use the secrets user_name/password
+    ## See: https://docs.gitlab.com/ee/administration/raketasks/smtp.html#secrets
+    # user_name: secrets.username,
+    # password: secrets.password,
     domain: "gitlab.company.com",
     authentication: :login,
     enable_starttls_auto: true,
@@ -31,6 +36,7 @@ end
 #
 # if Rails.env.production?
 #   Rails.application.config.action_mailer.delivery_method = :smtp_pool
+#   secrets = Gitlab::Email::SmtpConfig.secrets
 #
 #   ActionMailer::Base.delivery_method = :smtp_pool
 #   ActionMailer::Base.smtp_pool_settings = {
@@ -40,6 +46,10 @@ end
 #       port: 465,
 #       user_name: "smtp",
 #       password: "123456",
+#       ## If you are using encrypted smtp credentials then you should instead use the secrets user_name/password
+#       ## See: https://docs.gitlab.com/ee/administration/raketasks/smtp.html#secrets
+#       # user_name: secrets.username,
+#       # password: secrets.password,
 #       domain: "gitlab.company.com",
 #       authentication: :login,
 #       enable_starttls_auto: true,
diff --git a/config/initializers/transaction_metrics.rb b/config/initializers/transaction_metrics.rb
deleted file mode 100644
index 0175d487e66..00000000000
--- a/config/initializers/transaction_metrics.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-Gitlab::Database.install_monkey_patches
diff --git a/config/initializers_before_autoloader/004_zeitwerk.rb b/config/initializers_before_autoloader/004_zeitwerk.rb
index 18dfa2e9f40..4d8dcf4de6b 100644
--- a/config/initializers_before_autoloader/004_zeitwerk.rb
+++ b/config/initializers_before_autoloader/004_zeitwerk.rb
@@ -4,16 +4,13 @@ Rails.autoloaders.each do |autoloader|
   # We need to ignore these since these are non-Ruby files
   # that do not define Ruby classes / modules
   autoloader.ignore(Rails.root.join('lib/support'))
+  autoloader.ignore(Rails.root.join('ee/lib/ee/gitlab/ci/parsers/security/validators/schemas')) if Gitlab.ee?
 
-  # Ignore generators since these are loaded manually by Rails
-  # https://github.com/rails/rails/blob/v6.1.3.2/railties/lib/rails/command/behavior.rb#L56-L65
-  autoloader.ignore(Rails.root.join('lib/generators'))
-  autoloader.ignore(Rails.root.join('ee/lib/generators')) if Gitlab.ee?
-
-  # Mailer previews are also loaded manually by Rails
+  # Mailer previews are loaded manually by Rails
   # https://github.com/rails/rails/blob/v6.1.3.2/actionmailer/lib/action_mailer/preview.rb#L121-L125
   autoloader.ignore(Rails.root.join('app/mailers/previews'))
   autoloader.ignore(Rails.root.join('ee/app/mailers/previews')) if Gitlab.ee?
+  autoloader.ignore(Rails.root.join('jh/app/mailers/previews')) if Gitlab.jh?
 
   autoloader.inflector.inflect(
     'api' => 'API',
diff --git a/config/metrics/aggregates/code_review.yml b/config/metrics/aggregates/code_review.yml
index 1461931e268..482e1fc60a1 100644
--- a/config/metrics/aggregates/code_review.yml
+++ b/config/metrics/aggregates/code_review.yml
@@ -65,6 +65,7 @@
     - 'i_code_review_diff_multiple_files'
     - 'i_code_review_user_load_conflict_ui'
     - 'i_code_review_user_resolve_conflict'
+    - 'i_code_review_user_searches_diff'
 - name: code_review_category_monthly_active_users
   operator: OR
   source: redis
@@ -122,6 +123,7 @@
     - 'i_code_review_diff_multiple_files'
     - 'i_code_review_user_load_conflict_ui'
     - 'i_code_review_user_resolve_conflict'
+    - 'i_code_review_user_searches_diff'
 - name: code_review_extension_category_monthly_active_users
   operator: OR
   source: redis
diff --git a/config/metrics/counts_28d/20210201124930_deployments.yml b/config/metrics/counts_28d/20210201124930_deployments.yml
index ff6456731fe..b19276cdd4e 100644
--- a/config/metrics/counts_28d/20210201124930_deployments.yml
+++ b/config/metrics/counts_28d/20210201124930_deployments.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts_monthly.deployments
 description: Total deployments count for recent 28 days
 product_section: ops
 product_stage: release
 product_group: group::ops release
-product_category:
+product_category: 
 value_type: number
 status: data_available
 milestone: "13.2"
@@ -19,3 +19,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
index a9340d29e26..b031e885f93 100644
--- a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
@@ -1,17 +1,21 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: analytics_unique_visits.analytics_unique_visits_for_any_target_monthly
 description: Unique visitors to any analytics feature by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type:
+- smau
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
index f261fcfda1b..85c50572707 100644
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -1,17 +1,22 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.analytics.p_analytics_pipelines_monthly
 description: Unique visitors to /groups/:group/-/analytics/ci_cd by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_analytics_pipelines
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
index d81846a1736..70d4cb50aa4 100644
--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -1,17 +1,22 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.analytics.p_analytics_valuestream_monthly
 description: Unique visitors to /:group/:project/-/value_stream_analytics by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_analytics_valuestream
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
index c0c45f2df2f..ed867d30ff3 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -1,17 +1,22 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.analytics.i_analytics_cohorts_monthly
-description:
+description: 
 product_section: fulfillment
 product_stage: fulfillment
 product_group: group::utilization
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_analytics_cohorts
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
index 03187736700..af99fdbcca8 100644
--- a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
+++ b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
@@ -1,17 +1,22 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.analytics.i_analytics_dev_ops_score_monthly
 description: Unique visitors to /admin/dev_ops_report by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_analytics_dev_ops_score
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
index e9fb3dbfbb2..7ef394eddae 100644
--- a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.analytics.g_analytics_merge_request_monthly
 description:
 product_section: dev
@@ -10,8 +10,13 @@ value_type: number
 status: removed
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_analytics_merge_request
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
\ No newline at end of file
+skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
index 4d4f70b4e99..b46687608b4 100644
--- a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
+++ b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
@@ -1,17 +1,22 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.analytics.i_analytics_instance_statistics_monthly
 description: Unique visitors to /admin/usage_trends by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_analytics_instance_statistics
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
index 195b5c2fed5..fa71e5607c1 100644
--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: redis_hll_counters.analytics.analytics_total_unique_counts_monthly
 description: The number of unique users who visited any analytics feature by month
 product_section: dev
@@ -10,8 +10,29 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_viewing_analytics_group_devops_adoption
+    - i_analytics_dev_ops_adoption
+    - i_analytics_dev_ops_score
+    - p_analytics_merge_request
+    - i_analytics_instance_statistics
+    - g_analytics_contribution
+    - g_analytics_insights
+    - g_analytics_issues
+    - g_analytics_productivity
+    - g_analytics_valuestream
+    - p_analytics_pipelines
+    - p_analytics_code_reviews
+    - p_analytics_valuestream
+    - p_analytics_insights
+    - p_analytics_issues
+    - p_analytics_repo
+    - i_analytics_cohorts
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml
index b932ade9be2..97e1983b5d6 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.merge_requests
 description: Count of the number of users creating merge requests
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
index dc5ba4a9f61..921ab4885fa 100644
--- a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.projects_with_disable_overriding_approvers_per_merge_request
 description: Count of the number of projects with setting to disable overriding approvers per merge request
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
index 6420fd972fe..b86af740a13 100644
--- a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.projects_without_disable_overriding_approvers_per_merge_request
 description: Count of the number of projects without setting to disable overriding approvers per merge request
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
index e51b3819df6..6cdb30a18bf 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.merge_requests_users
 description: Monthly count of the number of merge request users
 product_section: dev
@@ -17,3 +17,6 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216175109_suggestions.yml b/config/metrics/counts_28d/20210216175109_suggestions.yml
index 9e29b3f3e4b..6b41d92d91f 100644
--- a/config/metrics/counts_28d/20210216175109_suggestions.yml
+++ b/config/metrics/counts_28d/20210216175109_suggestions.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.suggestions
 description: Count of unique users per month who create suggestions in merge request comments
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
index 197e7af6944..2db087832d0 100644
--- a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.source_code.merge_request_action_monthly
 description: Count of unique users who perform an action on a merge request
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - merge_request_action
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
index acd657dec0a..be85a73c7fa 100644
--- a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.source_code.i_source_code_code_intelligence_monthly
 description: Count of unique users who use code intelligence
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_source_code_code_intelligence
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
index 24509103daa..18b89a5b25a 100644
--- a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_mr_diffs_monthly
 description: Count of unique merge requests per month with diffs viewed
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_mr_diffs
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
index 569666d47af..b518c040926 100644
--- a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_single_file_diffs_monthly
 description: Count of unique users per month with diffs viewed file by file
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_single_file_diffs
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
index b22ba8104cf..c256637f367 100644
--- a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
@@ -1,8 +1,7 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_mr_single_file_diffs_monthly
-description: Count of unique merge requests per month with diffs viewed file
-  by file
+description: Count of unique merge requests per month with diffs viewed file by file
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_mr_single_file_diffs
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
index 99bb06699f5..013f185730a 100644
--- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_monthly
 description: Count of unique users per month who created a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
index 05b843d275b..744afd9809b 100644
--- a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_close_mr_monthly
 description: Count of unique users per month who closed a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_close_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
index eddb909eb93..45f5b8e6dac 100644
--- a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_reopen_mr_monthly
 description: Count of unique users per month who reopened a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_reopen_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
index 485b47344d0..4a7035c3ee1 100644
--- a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_merge_mr_monthly
 description: Count of unique users per month who merged a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_merge_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
index 710cd9c05de..8fd9dd97780 100644
--- a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_comment_monthly
 description: Count of unique users per month who commented on a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
index 304b0f2f8f3..693e7075104 100644
--- a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_edit_mr_comment_monthly
 description: Count of unique users per month who edited a comment on a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_edit_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
index cfe688f36c5..80d47f52583 100644
--- a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_remove_mr_comment_monthly
 description: Count of unique users per month who removed a comment on a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_remove_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
index e6f9eb418b9..a92186f2678 100644
--- a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_add_suggestion_monthly
 description: Count of unique users per month who added a suggestion
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_add_suggestion
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
index edf0ec5359f..468b1062365 100644
--- a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_apply_suggestion_monthly
 description: Count of unique users per month who applied a suggestion
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_apply_suggestion
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
index dd9b9706b7d..4637648ce92 100644
--- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_applications_cert_managers
 description: Total GitLab Managed clusters with Cert Manager enabled
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_cert_managers.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_cert_managers.status IN (3, 5))'>_clusters_applications_cert_managers"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
index bad028774ed..9e092d6f2e3 100644
--- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
+++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_applications_helm
 description: Total GitLab Managed clusters with Helm enabled
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_helm.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_helm.status IN (3, 5))'>_clusters_applications_helm"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
index a9af8e1cd3f..56ee17554eb 100644
--- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
+++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_applications_ingress
 description: Total GitLab Managed clusters with Ingress enabled
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_ingress.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_ingress.status IN (3, 5))'>_clusters_applications_ingress"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
index 0d24c5e0fae..3bed0406dd5 100644
--- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
+++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_applications_knative
 description: Total GitLab Managed clusters with Knative enabled
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_knative.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_knative.status IN (3, 5))'>_clusters_applications_knative"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
index 71ceb5cd3ea..6e7f851eb6d 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_management_project
 name: "count_distinct_user_id_from_management_project_clusters"
 description: Number of Kubernetes clusters with clusters management project being set
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
index b62ee3c733b..8c2e9b87870 100644
--- a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_disabled
 description: Total GitLab Managed disabled clusters
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE)'>_clusters"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
index 15fa74276ff..80e3872ddc3 100644
--- a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_enabled
 description: Total GitLab Managed clusters currently enabled
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE)'>_clusters"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
index 0f3f4129558..0a2f09a4bc0 100644
--- a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
+++ b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_gke
 description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters.provider_type = 1 AND (cluster_providers_gcp.status IN (3)) AND clusters.enabled = TRUE)'>_clusters_<with>_<adjective describing: '(clusters.provider_type = 1 AND (cluster_providers_gcp.status IN (3)) AND clusters.enabled = TRUE)'>_cluster_providers_gcp"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
index c6834fd28d9..63da2198876 100644
--- a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
+++ b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_eks
 description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters.provider_type = 2 AND (cluster_providers_aws.status IN (3)) AND clusters.enabled = TRUE)'>_clusters_<with>_<adjective describing: '(clusters.provider_type = 2 AND (cluster_providers_aws.status IN (3)) AND clusters.enabled = TRUE)'>_cluster_providers_aws"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
index 1e9e9f02343..2cb190d348f 100644
--- a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
+++ b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_user
 description: Total GitLab Managed clusters that are user provisioned
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters.provider_type = 0 AND clusters.enabled = TRUE)'>_clusters"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
index cb1339c8475..e67abe0543c 100644
--- a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.instance_clusters_disabled
 description: Total GitLab Managed disabled clusters attached to the instance
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE AND clusters.cluster_type = 1)'>_clusters"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
index eae8c0f7a3c..44784dbf040 100644
--- a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.instance_clusters_enabled
 description: Total GitLab Managed enabled clusters attached to the instance
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE AND clusters.cluster_type = 1)'>_clusters"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
index 4c69b0a7671..61735006560 100644
--- a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.group_clusters_disabled
 description: Total GitLab Managed disabled clusters attached to groups
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE AND clusters.cluster_type = 2)'>_clusters"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
index 3e149eefbd1..3973ddf26b6 100644
--- a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.group_clusters_enabled
 description: Total GitLab Managed enabled clusters attached to groups
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE AND clusters.cluster_type = 2)'>_clusters"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
index f93a6925e96..17b6fef0151 100644
--- a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.project_clusters_disabled
 description: Total GitLab Managed disabled clusters attached to projects
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE AND clusters.cluster_type = 3)'>_clusters"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
index bac36e62664..a59cdae01e5 100644
--- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.configure.project_clusters_enabled
 description: Total GitLab Managed enabled clusters attached to projects
 product_section: ops
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE AND clusters.cluster_type = 3)'>_clusters"
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index d856c0d2fd1..ac42d618ea0 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.verify.ci_builds
 description: Unique monthly builds in project
 product_section: ops
@@ -17,4 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index 9898d32b111..a3044a7b9aa 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.verify.ci_external_pipelines
 description: Total pipelines in external repositories in a month
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index 319d1d06e62..2b125cf1a7c 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.verify.ci_internal_pipelines
 description: Total pipelines in GitLab repositories in a month
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
index 774387813a3..8bf228643c8 100644
--- a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_auto_devops
 description: Total pipelines from an Auto DevOps template
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
index 31e92760c74..dd470b7da22 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_config_repository
 description: Total Monthly Pipelines from templates in repository
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index 5c31532f666..a593d08a567 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.verify.ci_pipeline_schedules
 description: Total monthly Pipeline schedules in GitLab
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index 8af3e4f4248..fdb67b99e55 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -1,7 +1,7 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.verify.ci_pipelines
-description:  "Distinct users triggering pipelines in a month"
+description: "Distinct users triggering pipelines in a month"
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
@@ -18,3 +18,7 @@ tier:
 - premium
 - ultimate
 - free
+performance_indicator_type:
+- smau
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216175556_ci_triggers.yml b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
index c02acdfeed6..a8f784ec579 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.verify.ci_triggers
 description: Total configured Triggers in project
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml b/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
deleted file mode 100644
index 6b6503e8c34..00000000000
--- a/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: usage_activity_by_stage_monthly.secure.user_dast_jobs
-description: Users who run a DAST job
-product_section: sec
-product_stage: secure
-product_group: group::dynamic analysis
-product_category: dynamic_application_security_testing
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175618_dast_pipeline.yml b/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
deleted file mode 100644
index a6c78293691..00000000000
--- a/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: usage_activity_by_stage_monthly.secure.dast_pipeline
-description: Count of pipelines that have at least 1 DAST job
-product_section: sec
-product_stage: secure
-product_group: group::dynamic analysis
-product_category: dynamic_application_security_testing
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- ultimate
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180308_personal_snippets.yml b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
index b36c6eddc02..1a4183acc62 100644
--- a/config/metrics/counts_28d/20210216180308_personal_snippets.yml
+++ b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.personal_snippets
 description: Monthly count of personal Snippets
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180310_project_snippets.yml b/config/metrics/counts_28d/20210216180310_project_snippets.yml
index c2b9edd4ece..1037c5ed029 100644
--- a/config/metrics/counts_28d/20210216180310_project_snippets.yml
+++ b/config/metrics/counts_28d/20210216180310_project_snippets.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.project_snippets
 description: Monthly count of project Snippets
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180312_snippets.yml b/config/metrics/counts_28d/20210216180312_snippets.yml
index 1d8b2e3725b..22e242d5cab 100644
--- a/config/metrics/counts_28d/20210216180312_snippets.yml
+++ b/config/metrics/counts_28d/20210216180312_snippets.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.snippets
 description: Monthly count of All Snippets
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180317_snippets.yml b/config/metrics/counts_28d/20210216180317_snippets.yml
index 169b79e7316..b501c8dd6d0 100644
--- a/config/metrics/counts_28d/20210216180317_snippets.yml
+++ b/config/metrics/counts_28d/20210216180317_snippets.yml
@@ -1,8 +1,8 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.snippets
 name: count_distinct_author_id_from_snippets
-description: Count of distinct author_id from snippets for last 28 days 
+description: Count of distinct author_id from snippets for last 28 days
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
index d66a7c0a63c..fc52a50969e 100644
--- a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
@@ -1,7 +1,7 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_web_ide_edit
-description: Number of users editing using web IDE 
+description: Number of users editing using web IDE
 product_section: dev
 product_stage: create
 product_group: group::editor
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
index df023578215..809f1bcc52f 100644
--- a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
+++ b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sfe_edit
 description: Number of users using single file editor
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
index 164128a6307..6c9bb0319cc 100644
--- a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
+++ b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_snippet_editor_edit
 description: Number of users using the snippet editor
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
index e9e408bb1f6..a181eacd724 100644
--- a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
+++ b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_sse_edit
 description: Number of users using the static site editor
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
index 3d123932ab2..f15f9817a58 100644
--- a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_ide_edit
 description: Number of unique users per month who edited a file from any web editor
 product_section: dev
@@ -17,3 +17,6 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
index ab1d9994162..770ba30b8a2 100644
--- a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_monthly
 description: Number of users editing a file from the Web IDE
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_edit_by_web_ide
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
index 9ae8b537651..44a6758d41e 100644
--- a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
+++ b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_monthly
 description: Number of users editing a file from the single file editor
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_edit_by_sfe
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
index ba83d1d3ae1..5cc87cba469 100644
--- a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ide_edit.g_edit_by_snippet_ide_monthly
 description: Count of monthly edits to a snippet
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_edit_by_snippet_ide
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
index 4dab922fe4b..81ccdfd0854 100644
--- a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_monthly
 description: Count of unique users per month who edited a file from the Web IDE
 product_section: dev
@@ -10,6 +10,13 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_edit_by_web_ide
+  - g_edit_by_sfe
+  - g_edit_by_snippet_ide
+  - g_edit_by_sse
 distribution:
 - ce
 - ee
@@ -17,3 +24,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml b/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
deleted file mode 100644
index aa02ce01a0d..00000000000
--- a/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: usage_activity_by_stage_monthly.secure.user_api_fuzzing_jobs
-description: Count of API Fuzzing jobs by job name
-product_section: sec
-product_stage: secure
-product_group: group::fuzz testing
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml b/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
deleted file mode 100644
index 14d7fa1f83d..00000000000
--- a/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: usage_activity_by_stage_monthly.secure.user_api_fuzzing_dnd_jobs
-description: Count of API Fuzzing `docker-in-docker` jobs by job names
-product_section: sec
-product_stage: secure
-product_group: group::fuzz testing
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
index d678e6c3c91..89afaa17bce 100644
--- a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
+++ b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.search.i_search_total_monthly
 description: Calculated unique users to perform Basic or Advanced searches by month
 product_section: enablement
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_search_total
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
index ec39054bffb..41d6d1f0d96 100644
--- a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.search.search_total_unique_counts_monthly
 description: Total unique users for i_search_total, i_search_advanced, i_search_paid for recent 28 days. This metric is redundant because advanced will be a subset of paid and paid will be a subset of total. i_search_total is more appropriate if you just want the total
 product_section: enablement
@@ -10,6 +10,12 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_search_total
+  - i_search_advanced
+  - i_search_paid
 distribution:
 - ce
 - ee
@@ -17,3 +23,5 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- gmau
diff --git a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
index 0d784481951..8a76ed1dc22 100644
--- a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.aggregated_metrics.incident_management_alerts_total_unique_counts
 description: Count of unique users per month to take an action on an alert
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
index 58fd23391b0..c561aafb144 100644
--- a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.aggregated_metrics.incident_management_incidents_total_unique_counts
 description: Count of unique users per month to take an action on an incident
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
index 3046bf5f8a8..f9a8a2d440a 100644
--- a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
+++ b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_incidents
 description: 'Count of unique projects with an incident created in the last month'
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
index 3ac5ec37317..70234ac6602 100644
--- a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_alert_incidents
 description: 'Count of unique projects with an incident from an alert created in the
   last month'
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
index 7cf04627875..5bbb15c786c 100644
--- a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_alert_status_changed_monthly
 description: Count of unique users changing alert's status changes per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_alert_status_changed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
index 46bdc9602c2..a23e14b8879 100644
--- a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_alert_assigned_monthly
 description: Count of unique users assigning an alert per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_alert_assigned
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
index ad9fd3debb6..4cbc1280562 100644
--- a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_alert_todo_monthly
 description: Count of unique users adding alerts to the TODO list per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_alert_todo
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
index eb9a25a1b93..97680ad4d1b 100644
--- a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_created_monthly
 description: Count of unique users creating incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_created
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
index 6a541dd5166..f14f31af62d 100644
--- a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_reopened_monthly
 description: Count of unique users reopening incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_reopened
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
index 1284cb547dc..0809c3fab68 100644
--- a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_closed_monthly
 description: Count of users closing incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_closed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
index 02493515a11..ceed852b509 100644
--- a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_assigned_monthly
 description: Count of users assigning incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_assigned
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
index 109b5af6c99..fbe1a334bbb 100644
--- a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_todo_monthly
 description: Count of unique users adding incidents to the TODO list per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_todo
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
index 8e1346916fe..d812b52d97b 100644
--- a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_comment_monthly
 description: Count of unique users adding comments per month on incidents
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_comment
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml b/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
index e64e09f1abb..313f75f7ebb 100644
--- a/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
+++ b/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_zoom_meeting_monthly
 description: Count of users creating Zoom meetings about incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_zoom_meeting
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
index d5913791a60..75c9fa64f8c 100644
--- a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_relate_monthly
 description: Count of unique users adding issues per month that are related to an incident
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_relate
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
index f59613a2723..473b0a2b2ad 100644
--- a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_unrelate_monthly
 description: Count of users removing issues that are related to an incident per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_unrelate
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
index e2205dd7d35..17ab21c9818 100644
--- a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_change_confidential_monthly
 description: Count of users changing incidents to confidential per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_change_confidential
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
index fe952b30f50..5a09b270eb2 100644
--- a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
@@ -1,15 +1,32 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_monthly
 description: Count of unique users performing events related with incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_incident_created
+    - incident_management_incident_reopened
+    - incident_management_incident_closed
+    - incident_management_incident_assigned
+    - incident_management_incident_todo
+    - incident_management_incident_comment
+    - incident_management_incident_zoom_meeting
+    - incident_management_incident_published
+    - incident_management_incident_relate
+    - incident_management_incident_unrelate
+    - incident_management_incident_change_confidential
+    - incident_management_alert_status_changed
+    - incident_management_alert_assigned
+    - incident_management_alert_todo
 distribution:
 - ce
 - ee
@@ -17,3 +34,7 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- smau
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
index 3e24cb64d4f..14ba7fa3421 100644
--- a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
+++ b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management_alerts.incident_management_alert_create_incident_monthly
 description: Count of unique users per month to create an incident corresponding to
   an alert
@@ -11,6 +11,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - incident_management_alert_create_incident
 distribution:
 - ce
 - ee
@@ -18,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
index da71196bce9..38048e0f443 100644
--- a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
+++ b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.projects_imported_from_github
-description:
+description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
index 1468589281d..beb8969618f 100644
--- a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
+++ b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_design_management
 description: Monthly active users for design management
 product_section: dev
@@ -17,3 +17,5 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
index fa650effab3..1353686c5a6 100644
--- a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
+++ b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_wiki_repo
 description: Unique monthly active users of the Wiki
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180814_events.yml b/config/metrics/counts_28d/20210216180814_events.yml
index 745a3c0066a..ddc06e6c9ea 100644
--- a/config/metrics/counts_28d/20210216180814_events.yml
+++ b/config/metrics/counts_28d/20210216180814_events.yml
@@ -1,18 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.events
-description:
+description: 
 product_section: dev
-product_stage:
+product_stage: 
 product_group: group::manage
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
 tier:
 - free
 skip_validation: true
+performance_indicator_type:
+- umau
diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml
index 0ae86d09c13..247fa015c22 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.groups
 description: Number of users who are group members for last 28 days
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml
index 40e881638bb..319b8a08e79 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.users_created
 description: Number of users created in the month
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
index aa0191ff47f..7b928a08fae 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.projects_with_prometheus_alerts
 description: Projects with Prometheus alerting enabled
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -12,9 +12,10 @@ milestone_removed: '14.0'
 time_frame: 28d
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180956_clusters.yml b/config/metrics/counts_28d/20210216180956_clusters.yml
index 2fb39849c11..d5a54796a1f 100644
--- a/config/metrics/counts_28d/20210216180956_clusters.yml
+++ b/config/metrics/counts_28d/20210216180956_clusters.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.clusters
 description: Count users creating clusters in last 28 days.
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -11,9 +11,10 @@ status: data_available
 time_frame: 28d
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
index ef305404ad1..615bb247f86 100644
--- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.clusters_applications_prometheus
 description: Users creating clusters with Prometheus enabled in last 28 days.
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -11,9 +11,10 @@ status: data_available
 time_frame: 28d
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
index 6d57a5c0ce1..2d29c9fd088 100644
--- a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.operations_dashboard_default_dashboard
 description: Active users with enabled operations dashboard
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -11,9 +11,10 @@ status: data_available
 time_frame: 28d
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
index 13cf98b9a2a..ac0e6015cb9 100644
--- a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: tracing
 value_type: number
@@ -11,9 +11,10 @@ status: data_available
 time_frame: 28d
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
index 5b67dcc38d7..f5c1ecec384 100644
--- a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_error_tracking_enabled
 description: Count of users creating projects with error tracking enabled.
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -11,9 +11,10 @@ status: data_available
 time_frame: 28d
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
index 5fde9570540..7ffe2e82ab2 100644
--- a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.operations_dashboard_users_with_projects_added
 description: Active users with projects on operations dashboard
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -11,9 +11,10 @@ status: data_available
 time_frame: 28d
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index d818f90c7a0..c007ab50182 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.packages
 description: A monthly count of packages published to the registry
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
index bd8ec61b39f..e1f1bcd05e7 100644
--- a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
+++ b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.package.projects_with_packages
 description: The total number of projects in a given month with at least one package
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index 8264ea12af0..dd36265fe9d 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.plan.issues
 description: Count of users creating Issues in last 28 days.
 product_section: dev
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181141_notes.yml b/config/metrics/counts_28d/20210216181141_notes.yml
index d041f9b8685..0e2d39e42e7 100644
--- a/config/metrics/counts_28d/20210216181141_notes.yml
+++ b/config/metrics/counts_28d/20210216181141_notes.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.plan.notes
 description: Count of MAU commenting on an issuable
 product_section: dev
@@ -9,11 +9,12 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: database 
+data_source: database
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181143_projects.yml b/config/metrics/counts_28d/20210216181143_projects.yml
index a367ade1802..16e2ddf8050 100644
--- a/config/metrics/counts_28d/20210216181143_projects.yml
+++ b/config/metrics/counts_28d/20210216181143_projects.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.plan.projects
 description: Count of MAU creating projects
 product_section: dev
-product_stage: plan 
+product_stage: plan
 product_group: group::project management
 product_category: projects
 value_type: number
@@ -12,8 +12,9 @@ time_frame: 28d
 data_source: database
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181145_todos.yml b/config/metrics/counts_28d/20210216181145_todos.yml
index 43a19351939..e35963f2a57 100644
--- a/config/metrics/counts_28d/20210216181145_todos.yml
+++ b/config/metrics/counts_28d/20210216181145_todos.yml
@@ -1,19 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.plan.todos
 description: Count of MAU creating todos
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: database 
+data_source: database
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
index 708df218357..92f5a618bff 100644
--- a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
@@ -1,18 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.plan.service_desk_enabled_projects
-description:
+description: Count creator ids from projects with service desk enabled
 product_section: dev
-product_stage:
+product_stage: plan
 product_group: group::plan
-product_category:
+product_category: service_desk
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium 
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
index 0a8bc14a581..0cd2ea2632f 100644
--- a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
+++ b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
@@ -1,18 +1,20 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.service_desk_issues
-description:
+description: Count of service desk issues
 product_section: dev
-product_stage:
+product_stage: plan
 product_group: group::plan
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
index 60be7632ceb..a51dfa3e49f 100644
--- a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
+++ b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_active
-description:
+description:  Distinct count of creator_id from projects with an active Jira integration.
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
index bab2db5ad43..e78d178c081 100644
--- a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_dvcs_cloud_active
-description:
+description: Distinct count of creator_id from projects with an active Jira Cloud DVCS integration.
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: ecosystem
+product_group: group::integration
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
index 0d9a42d3512..c5a8b0cf75e 100644
--- a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
@@ -1,17 +1,21 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_dvcs_server_active
-description:
+description: Distinct count of creator_id from projects with an active Jira Server DVCS integration.
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: ecosystem
+product_group: group::integration
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
+
diff --git a/config/metrics/counts_28d/20210216181158_epics.yml b/config/metrics/counts_28d/20210216181158_epics.yml
index 8b5694c96c0..9ede1ef12f8 100644
--- a/config/metrics/counts_28d/20210216181158_epics.yml
+++ b/config/metrics/counts_28d/20210216181158_epics.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.plan.epics
-description:
+description: Count distinct author ids from epics
 product_section: dev
-product_stage:
+product_stage: plan
 product_group: group::plan
-product_category:
+product_category: epics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- premium
+performance_indicator_type:
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216181200_label_lists.yml b/config/metrics/counts_28d/20210216181200_label_lists.yml
index 354c8c3f41b..f7eaf2bf484 100644
--- a/config/metrics/counts_28d/20210216181200_label_lists.yml
+++ b/config/metrics/counts_28d/20210216181200_label_lists.yml
@@ -1,19 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.plan.label_lists
 description: Count of MAU creating label lists on Boards
 product_section: dev
 product_stage: plan
-product_group: group::project management 
-product_category: boards 
+product_group: group::project management
+product_category: boards
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: database 
+data_source: database
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
index 545741e02c5..285f8371785 100644
--- a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_monthly
 description: Count of MAU editing an issue title
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_title_changed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
index 6afaaf788d2..554bc86cada 100644
--- a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_description_changed_monthly
 description: Count of MAU editing an issue description
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_description_changed
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
index 0fbdb16384f..07fa4ceaa3c 100644
--- a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_assignee_changed_monthly
 description: Count of MAU changing issue assignees
 product_section: dev
@@ -10,11 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_assignee_changed
 distribution:
-- ce 
-- ee 
+- ce
+- ee
 tier:
-- free 
-- premium 
-- ultimate 
-
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
index 64584106f54..5417ffe2433 100644
--- a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_confidential_monthly
 description: Count of MAU making an issue confidential
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_made_confidential
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate 
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
index 12ad3c7469e..f7c63e9bd03 100644
--- a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
+++ b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_visible_monthly
 description: Count of MAU making an issue not confidential
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_made_visible
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate 
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
index 1e1a93572a2..a0b173e5c37 100644
--- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_created_monthly
 description: Count of MAU creating new issues
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_created
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
index c5f26b01f76..7ff662b2466 100644
--- a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_closed_monthly
 description: Count of MAU closing an issue
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_closed
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
index 79148942f11..f6b3b824afd 100644
--- a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_reopened_monthly
 description: Count of MAU re-opening a closed issue
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_reopened
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
index aa6c7f74a34..a84dcac22d9 100644
--- a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_label_changed_monthly
 description: Count of MAU changing an issue's label
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_label_changed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index fc2b81eaf96..12ea62b75f1 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_milestone_changed_monthly
 description: Count of MAU changing an issue's milestone
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_milestone_changed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
index da20c78f10d..a7f631d6620 100644
--- a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
+++ b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_cross_referenced_monthly
 description: Count of MAU referencing an issue from somewhere else
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_cross_referenced
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
index 80c55c9c75f..1538b0cc755 100644
--- a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
+++ b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_moved_monthly
 description: Count of MAU moving an issue to another project
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_moved
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
index 30e688b95f7..02926948430 100644
--- a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
+++ b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_related_monthly
 description: Count of MAU relating an issue to another issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_related
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
index a5786dcc00e..01c5c768674 100644
--- a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
+++ b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_unrelated_monthly
 description: Count of MAU unrelating an issue to another issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_unrelated
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
index ccc96aefc7b..ca0573ba618 100644
--- a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_marked_as_duplicate_monthly
 description: Count of MAU marking an issue as a duplicate
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_marked_as_duplicate
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
index 38d1cddb8ff..012eaeb5001 100644
--- a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_locked_monthly
 description: Count of MAU locking an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_locked
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
index 2045f29d91b..a1b800b77cf 100644
--- a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_unlocked_monthly
 description: Count of MAU unlocking an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_unlocked
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
index a9a6335b158..e94d56ad8b8 100644
--- a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_added_monthly
 description: Count of MAU adding a design to an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_designs_added
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
index b029c819f21..0af03218ab0 100644
--- a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
+++ b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_modified_monthly
 description: Count of MAU modifying a design on an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_designs_modified
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
index a47c5a7b4dd..c466a775050 100644
--- a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_removed_monthly
 description: Count of MAU removing a design from an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_designs_removed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
index 13e127d9235..29517a25739 100644
--- a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_due_date_changed_monthly
 description: Count of MAU changing an issue due date
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_due_date_changed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
index d6a364929bc..6f572b3a0c9 100644
--- a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_estimate_changed_monthly
 description: Count of MAU changing an issue time estimate
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_time_estimate_changed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
index fe0386739ba..4c0717f699c 100644
--- a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_spent_changed_monthly
 description: Count of MAU recording time spent on an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_time_spent_changed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
index e2ff10cb06f..dc7775542dd 100644
--- a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_added_monthly
 description: Count of MAU commenting on an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_comment_added
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
index 610746013fd..27c18c21b3d 100644
--- a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_edited_monthly
 description: Count of MAU editing a comment on an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_comment_edited
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
index 776fc707274..ce0bfa86bcd 100644
--- a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_removed_monthly
 description: Count of MAU deleting a comment from an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_comment_removed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
index e509b4d2af2..2d785856ed8 100644
--- a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
+++ b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_cloned_monthly
 description: Count of MAU cloning an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_cloned
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
index f0234ca62a6..5da5997ad67 100644
--- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: redis_hll_counters.issues_edit.issues_edit_total_unique_counts_monthly
 description: Aggregate count of MAU taking an action related to an issue
 product_section: dev
@@ -10,6 +10,42 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_title_changed
+    - g_project_management_issue_description_changed
+    - g_project_management_issue_assignee_changed
+    - g_project_management_issue_made_confidential
+    - g_project_management_issue_made_visible
+    - g_project_management_issue_created
+    - g_project_management_issue_closed
+    - g_project_management_issue_reopened
+    - g_project_management_issue_label_changed
+    - g_project_management_issue_milestone_changed
+    - g_project_management_issue_iteration_changed
+    - g_project_management_issue_weight_changed
+    - g_project_management_issue_cross_referenced
+    - g_project_management_issue_moved
+    - g_project_management_issue_related
+    - g_project_management_issue_unrelated
+    - g_project_management_issue_marked_as_duplicate
+    - g_project_management_issue_locked
+    - g_project_management_issue_unlocked
+    - g_project_management_issue_added_to_epic
+    - g_project_management_issue_removed_from_epic
+    - g_project_management_issue_changed_epic
+    - g_project_management_issue_designs_added
+    - g_project_management_issue_designs_modified
+    - g_project_management_issue_designs_removed
+    - g_project_management_issue_due_date_changed
+    - g_project_management_issue_time_estimate_changed
+    - g_project_management_issue_time_spent_changed
+    - g_project_management_issue_comment_added
+    - g_project_management_issue_comment_edited
+    - g_project_management_issue_comment_removed
+    - g_project_management_issue_health_status_changed
+    - g_project_management_issue_cloned
 distribution:
 - ce
 - ee
@@ -17,3 +53,7 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- smau
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
index db9f1d99360..452d83dec1b 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_approve_monthly
 description: Count of MAU using the `/approve` quick action
 product_section: dev
@@ -14,6 +14,10 @@ instrumentation_class: RedisHLLMetric
 options:
   events:
     - i_quickactions_approve
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_approve
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
index 5586b4755cd..1e213eeb778 100644
--- a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
+++ b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_single_monthly
 description: Count of MAU using the `/assign @user1` quick action to assign a single individual to an issuable 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_single
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
index e0ec4d50413..10f38fbcb9c 100644
--- a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
+++ b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_self_monthly
 description: Count of MAU using the `/assign me` quick action to assign self to an issuable 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_self
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
index fac65eb896f..f9351208172 100644
--- a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_reviewer_monthly
 description: Count of MAU using the `/assign_reviewer` or `request_reviewer` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_reviewer
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
index 044b8037d05..90ea87a63cf 100644
--- a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
+++ b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_award_monthly
 description: Count of MAU using the `/award` quick action to set an award emoji on an issuable 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_award
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
index b84f9be0a1d..cc86c66caf6 100644
--- a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_board_move_monthly
 description: Count of MAU using the `/board_move` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_board_move
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
index ddbffe29356..0f7ad1b15cc 100644
--- a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_clone_monthly
 description: Count of MAU using the `/clone` quick action to clone an issue.
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_clone
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
index ca647f138d5..4750bc1412e 100644
--- a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
+++ b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_close_monthly
 description: Count of MAU using the `/close` quick action to close an issuable
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_close
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
index e6f74098306..843f00bda28 100644
--- a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_confidential_monthly
 description: Count of MAU using the `/confidential` quick action to set an issue as confidential
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_confidential
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
index 69b46b3d0fe..41e31b3031a 100644
--- a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_merge_request_monthly
 description: Count of MAU using the `/copy_metadata` quick action on a Merge Request
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_copy_metadata_merge_request
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
index ebb754bad3b..861bb1ac02b 100644
--- a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_issue_monthly
 description: Count of MAU using the `/copy_metadata` quick action on an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_copy_metadata_issue
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
index bb5918c155a..ec09f5a3269 100644
--- a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_create_merge_request_monthly
 description: Count of MAU using the `/create_merge_request` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_create_merge_request
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
index 7f607aa3dd0..84b7359359a 100644
--- a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
+++ b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_done_monthly
 description: Count of MAU using the `/done` quick action to mark a todo as done
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_done
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
index 8987d7325e7..d503f9c56b7 100644
--- a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_draft_monthly
 description: Count of MAU using the `/draft` quick action on a Merge Request
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_draft
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
index 551975324bc..d1e18f0e072 100644
--- a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
+++ b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_due_monthly
 description: Count of MAU using the `/due` quick action to change the due date on an issuable 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_due
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
index b7e6cec88cf..eb8e1f504d9 100644
--- a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_duplicate_monthly
 description: Count of MAU using the `/duplicate` quick action to mark an issue as a duplicate of another
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_duplicate
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
index ac99b84040d..91c79aff0fe 100644
--- a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_estimate_monthly
 description: Count of MAU using the `/estimate` quick action to set a time estimate on an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_estimate
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
index 481798bbcd0..774bcc02bef 100644
--- a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
+++ b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_label_monthly
 description: Count of MAU using the `/label` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_label
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
index 9e2a63ef679..13aeb663c87 100644
--- a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_lock_monthly
 description: Count of MAU using the `/lock` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_lock
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
index 7e9130cea34..64f987ae889 100644
--- a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
+++ b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_merge_monthly
 description: Count of MAU using the `/merge` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_merge
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
index ca01e8c22e1..7865b63c6ea 100644
--- a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_milestone_monthly
 description: Count of MAU using the `/milestone` quick action 
 product_section: dev 
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_milestone
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
index 89f1ee7ed89..d57b4cb31af 100644
--- a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_move_monthly
 description: Count of MAU using the `/move` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_move
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
index 3ea1c762b8b..5b7a8a6a4c8 100644
--- a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
+++ b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reassign_monthly
 description: Count of MAU using the `/reassign @user1` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_reassign
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
index f7f314181ae..1da59b2b523 100644
--- a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reassign_reviewer_monthly
 description: Count of MAU using the `/reassign_reviewer` quick action
 product_section: dev
@@ -10,10 +10,14 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_reassign_reviewer
 distribution:
 - ce
 - ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
diff --git a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
index 5fb1f9782ba..b49f8796179 100644
--- a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
+++ b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_rebase_monthly
 description: Count of MAU using the `/rebase` quick action on a Merge Request
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_rebase
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
index 8d695c1cae6..287bb72a37f 100644
--- a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
+++ b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_relabel_monthly
 description: Count of MAU using the `/relabel` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_relabel
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
index 8d5e2f28110..acaf3378966 100644
--- a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_relate_monthly
 description: Count of MAU using the `/relate` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_relate
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
index f008cc32c60..1bf024eb356 100644
--- a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
+++ b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_due_date_monthly
 description: Count of MAU using the `/remove_due_date` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_due_date
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
index 4f916ec0790..4e878c9c37c 100644
--- a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_monthly
 description: Count of MAU using the `/remove_estimate` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_estimate
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
index 238f1d6aeae..d2cd09a7d2b 100644
--- a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_monthly
 description: Count of MAU using the `/remove_milestone` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_milestone
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
index c8d2fee4a36..58f7ef809c4 100644
--- a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
+++ b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_time_spent_monthly
 description: Count of MAU using the `/remove_time_spent` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_time_spent
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
index 275dc78a488..a9e53de5c8f 100644
--- a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_monthly
 description: Count of MAU using the `/remove_zoom` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_zoom
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
index 43017704a3b..6a104d2e1cb 100644
--- a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
+++ b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reopen_monthly
 description: Count of MAU using the `/reopen` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_reopen
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
index 2d863104808..d4ebe27abec 100644
--- a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
+++ b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_shrug_monthly
 description: Count of MAU using the `/shrug` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_shrug
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
index e02663015f1..fb0bfcb8f01 100644
--- a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
+++ b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_subtract_monthly
 description: Count of MAU using the `/spend` quick action to subtract time spent 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_spend_subtract
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
index 38eca135cc4..dbd94c30488 100644
--- a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
+++ b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_add_monthly
 description: Count of MAU using the `/spend` quick action to add time spent 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_spend_add
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
index 0c06fca60a0..0058aa315c8 100644
--- a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_submit_review_monthly
 description: Count of MAU using the `/submit_review` quick action on Merge Requests
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_submit_review
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
index 4e0605f1ee6..7aa266017b4 100644
--- a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_monthly
 description: Count of MAU using the `/subscribe` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_subscribe
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
index 1690e634a01..c8695b2776e 100644
--- a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_monthly
 description: Count of MAU using the `/tableflip` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_tableflip
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
index 84f201ebb21..de74bb6f7b0 100644
--- a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
+++ b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tag_monthly
 description: Count of MAU using the `/tag` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_tag
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
index 7a792e721f6..7de88a30689 100644
--- a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
+++ b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_target_branch_monthly
 description: Count of MAU using the `/target_branch` quick action on Merge Requests
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_target_branch
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
index 31c10b3ac34..fb94d9581f8 100644
--- a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_title_monthly
 description: Count of MAU using the `/title` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_title
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
index 99866112c5d..c101c389dfe 100644
--- a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_todo_monthly
 description: Count of MAU using the `/todo` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_todo
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
index 4cbc8aea8f6..98e0b1bdff3 100644
--- a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_specific_monthly
 description: Count of MAU using the `/unassign @user1` quick action on Merge Requests
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unassign_specific
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
index 220db3470dd..502bc6bccfa 100644
--- a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_all_monthly
 description: Count of MAU using the `/unassign` quick action on Merge Requests
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unassign_all
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
index 7a9f050ebbf..1e3ea5daac8 100644
--- a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_reviewer_monthly
 description: Count of MAU using the `/unassign_reviewer` or `/remove_reviewer` quick action on Merge Requests
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unassign_reviewer
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
index 65ad4cd898c..d8f3ece625f 100644
--- a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_specific_monthly
 description: Count of MAU using the `/unlabel` or `/remove_label` quick action to remove one or more specific labels
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unlabel_specific
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
index 6fd22faa3d7..df3403f9f0a 100644
--- a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_all_monthly
 description: Count of MAU using the `/unlabel` quick action to remove all labels
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unlabel_all
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
index e47a83fd09e..4fa69c643c9 100644
--- a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlock_monthly
 description: Count of MAU using the `/unlock` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unlock
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
index 406edee8795..f3add38826d 100644
--- a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unsubscribe_monthly
 description: Count of MAU using the `/unsubscribe` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unsubscribe
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
index d8d2778ac38..2aa277a0163 100644
--- a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_wip_monthly
 description: Count of MAU using the `/wip` quick action on Merge Requests
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_wip
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
index a619b3def45..b6ff94e5367 100644
--- a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_zoom_monthly
 description: Count of MAU using the `/zoom` quick action on Issues 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_zoom
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216181923_successful_deployments.yml b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
index de1b4a6a583..45b50f20720 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -1,17 +1,21 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.successful_deployments
 description: Total successful deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
+- premium
+- ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181924_failed_deployments.yml b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
index 92a7dc95186..a7f0d6e5847 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -1,17 +1,21 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.failed_deployments
 description: Total failed deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
+- premium
+- ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181935_deployments.yml b/config/metrics/counts_28d/20210216181935_deployments.yml
index 21dcf0a3884..01978e14de0 100644
--- a/config/metrics/counts_28d/20210216181935_deployments.yml
+++ b/config/metrics/counts_28d/20210216181935_deployments.yml
@@ -1,17 +1,21 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.release.deployments
 description: Unique users triggering deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
+- premium
+- ultimate
 skip_validation: true
+performance_indicator_type:
+- smau
diff --git a/config/metrics/counts_28d/20210216181937_failed_deployments.yml b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
index 75496173175..0bf293cef72 100644
--- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
@@ -1,17 +1,21 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.release.failed_deployments
 description: Total failed deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
+- premium
+- ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181939_releases.yml b/config/metrics/counts_28d/20210216181939_releases.yml
index 232a8c12873..858b760e464 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -1,17 +1,23 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.release.releases
 description: Unique users creating release tags
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
+- premium
+- ultimate
 skip_validation: true
+performance_indicator_type:
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216181941_successful_deployments.yml b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
index a3c5e8f7374..1d3a5f23cfd 100644
--- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
@@ -1,17 +1,21 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.release.successful_deployments
 description: Total successful deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
+- premium
+- ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
index f80caef1333..e515792f124 100644
--- a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
+++ b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.verify.clusters_applications_runner
 description: Total GitLab Managed clusters with Runner enabled
 product_section: ops
@@ -9,7 +9,7 @@ product_category: runner
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml b/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml
index a1d2b955480..8c659619dfc 100644
--- a/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml
+++ b/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.user_unique_users_all_secure_scanners
-description:
+description: 
 product_section: sec
-product_stage:
+product_stage: 
 product_group: group::secure
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type:
+- smau
diff --git a/config/metrics/counts_28d/20210216182034_deploy_keys.yml b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
index 62ce9d03fa0..f6949e85a5b 100644
--- a/config/metrics/counts_28d/20210216182034_deploy_keys.yml
+++ b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.deploy_keys
 description: Count of users creating deploy keys in last 28 days.
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216182036_keys.yml b/config/metrics/counts_28d/20210216182036_keys.yml
index 95d2524dd6e..ca77b038a1e 100644
--- a/config/metrics/counts_28d/20210216182036_keys.yml
+++ b/config/metrics/counts_28d/20210216182036_keys.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.keys
 description: Count of users creating regular keys in last 28 days.
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
index 01375ac0584..340ce92ad80 100644
--- a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
+++ b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.remote_mirrors
 description: Count of users creating projects with remote mirrors. Includes both push and pull mirrors.
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
index cecef03078d..cf40c69e276 100644
--- a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
+++ b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_project_repo
 description: Count of monthly active users who have performed any Git operation (read/write/push)
 product_section: dev
@@ -17,3 +17,7 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- smau
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
index b91b87800e1..a37ec1225ff 100644
--- a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
+++ b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.action_monthly_active_users_git_write
 description: Aggregated value for wiki, design, and project repo Git write actions
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216182051_protected_branches.yml b/config/metrics/counts_28d/20210216182051_protected_branches.yml
index 196ecce497e..9e1afb8146c 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.create.protected_branches
 description: Count of users creating projects with repositories making use of at least one protected branch in last 28 days.
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
index 834bfca933b..b34c2a44a8c 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.source_code.wiki_action_monthly
 description: Count of unique actions done on a wiki (create, edit, delete)
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - wiki_action
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
index b63c79fa9b5..b08d1181b0a 100644
--- a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.source_code.design_action_monthly
 description: Count of total design actions (upload, delete, comment, reply)
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - design_action
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
index c5b38cf041e..c766eb71596 100644
--- a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.source_code.project_action_monthly
 description: Count of unique actions done on projects and related resources (create, edit, delete, comment)
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - project_action
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml b/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
index 1cac9649385..7d1f7d333f2 100644
--- a/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
+++ b/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.user_sast_jobs
 description: Users who run a SAST job
 product_section: sec
@@ -17,3 +17,6 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml b/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
index c1da3f76981..e600c877c7b 100644
--- a/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
+++ b/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.user_secret_detection_jobs
 description: Users who run a Secret Detection job
 product_section: sec
@@ -17,3 +17,6 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
index a340dc960d3..8d45c304779 100644
--- a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.sast_pipeline
 description: Counts of Pipelines that have at least 1 SAST job
 product_section: sec
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
index 171a9696d12..ff1067285de 100644
--- a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.secret_detection_pipeline
 description: Counts of Pipelines that have at least 1 Secret Detection job
 product_section: sec
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
index 0a94cd08b0e..396f9534393 100644
--- a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
+++ b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.testing.i_testing_test_case_parsed_monthly
 description: Internal Tracking to count number of unit tests parsed for planning of
   future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
@@ -11,6 +11,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_test_case_parsed
 distribution:
 - ce
 - ee
@@ -18,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
index 64d403d10d3..4d09eb0b376 100644
--- a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
+++ b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.projects_with_alerts_created
 description: Monthly count of unique projects with HTTP alerting enabled
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -11,9 +11,10 @@ status: data_available
 time_frame: 28d
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
index a412754ca62..924a19cae74 100644
--- a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.aggregated_metrics.product_analytics_test_metrics_union
 description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
 product_section: growth
diff --git a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
index 2583c51990f..1e3913056e1 100644
--- a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.aggregated_metrics.product_analytics_test_metrics_intersection
 description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
 product_section: growth
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index 2a3544fa601..d059bcd8022 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.omniauth_providers
 description: Number of unique user logins using an OmniAuth provider
 product_section: dev
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183629_two-factor.yml b/config/metrics/counts_28d/20210216183629_two-factor.yml
index 0165a40155e..4d4603818eb 100644
--- a/config/metrics/counts_28d/20210216183629_two-factor.yml
+++ b/config/metrics/counts_28d/20210216183629_two-factor.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor
 description: Number of unique user logins using two factor authentication
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml b/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
index d814e539b26..fe24823cdd6 100644
--- a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
+++ b/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor-via-u2f-device
 description: Number of unique user logins using two factor via a U2F device
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml b/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
index a910851e2f0..95176ccabe5 100644
--- a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
+++ b/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor-via-webauthn-device
 description: Number of unique user logins using two factor via a WebAuthn device
 product_section: dev
diff --git a/config/metrics/counts_28d/20210216183634_standard.yml b/config/metrics/counts_28d/20210216183634_standard.yml
index 0144c251c93..172fa780a69 100644
--- a/config/metrics/counts_28d/20210216183634_standard.yml
+++ b/config/metrics/counts_28d/20210216183634_standard.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.standard
 description: Number of unique user logins using password authentication
 product_section: dev
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183636_google_oauth2.yml b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
index ce5112fcc88..1fdccd17217 100644
--- a/config/metrics/counts_28d/20210216183636_google_oauth2.yml
+++ b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.google_oauth2
 description: Number of unique user logins using Google OAuth authentication
 product_section: dev
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
index 49473e2cfad..063c16fefef 100644
--- a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
+++ b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.unique_users_all_imports
-description: Number of users from projects imported
+description: Number of unique users performing imports
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category: ''
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
@@ -17,3 +17,6 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216183640_gitlab.yml b/config/metrics/counts_28d/20210216183640_gitlab.yml
index 2c53566fbd5..139184cc8ac 100644
--- a/config/metrics/counts_28d/20210216183640_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183640_gitlab.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.bulk_imports.gitlab
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: DEPRECATED - Count of projects imported using bulk imports
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
index dd0ba521d2f..dc8dec74ef3 100644
--- a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
+++ b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.bulk_imports.gitlab_v1
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of bulk imports - GitLab Migration
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183644_gitlab_project.yml b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
index 6ec8fdc7509..394d85b4863 100644
--- a/config/metrics/counts_28d/20210216183644_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_project
-description: ''
+description: Count of projects imported using Project Import/Export
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category: ''
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183646_gitlab.yml b/config/metrics/counts_28d/20210216183646_gitlab.yml
index 09825a146db..84a6387fbf5 100644
--- a/config/metrics/counts_28d/20210216183646_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183646_gitlab.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab
 description: Count of projects imported from GitLab using Project Export/Import
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category: ''
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183648_github.yml b/config/metrics/counts_28d/20210216183648_github.yml
index 62873a57949..d7ad93520a7 100644
--- a/config/metrics/counts_28d/20210216183648_github.yml
+++ b/config/metrics/counts_28d/20210216183648_github.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.github
 description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
diff --git a/config/metrics/counts_28d/20210216183650_bitbucket.yml b/config/metrics/counts_28d/20210216183650_bitbucket.yml
index 82be4fb910a..c702f1a065f 100644
--- a/config/metrics/counts_28d/20210216183650_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183650_bitbucket.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.bitbucket
 description: Count of projects imported from Bitbucket
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
diff --git a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
index cbf34c1d7cd..0781ceca40f 100644
--- a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.bitbucket_server
 description: Count of projects imported from Bitbucket Server
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
diff --git a/config/metrics/counts_28d/20210216183653_gitea.yml b/config/metrics/counts_28d/20210216183653_gitea.yml
index 0b660825f83..f5909eb7475 100644
--- a/config/metrics/counts_28d/20210216183653_gitea.yml
+++ b/config/metrics/counts_28d/20210216183653_gitea.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.gitea
 description: Count of projects imported from Gitea
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183655_git.yml b/config/metrics/counts_28d/20210216183655_git.yml
index 7b0457c5902..68738e36ddd 100644
--- a/config/metrics/counts_28d/20210216183655_git.yml
+++ b/config/metrics/counts_28d/20210216183655_git.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.git
 description: Count of projects imported from Git
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category: ''
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183657_manifest.yml b/config/metrics/counts_28d/20210216183657_manifest.yml
index 28796fefaf4..d93467a3965 100644
--- a/config/metrics/counts_28d/20210216183657_manifest.yml
+++ b/config/metrics/counts_28d/20210216183657_manifest.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.manifest
-description: ''
+description: Count of projects imported using Manifest file
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category: ''
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
index 081992cab1f..40f4965f8a0 100644
--- a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.gitlab_migration
-description: ''
+description: Count of projects imported using GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category: ''
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183701_jira.yml b/config/metrics/counts_28d/20210216183701_jira.yml
index 3dbb664d5f6..cb6c808fb90 100644
--- a/config/metrics/counts_28d/20210216183701_jira.yml
+++ b/config/metrics/counts_28d/20210216183701_jira.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.issue_imports.jira
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of imports from Jira
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183703_fogbugz.yml b/config/metrics/counts_28d/20210216183703_fogbugz.yml
index e89d9a7befb..e3369043e74 100644
--- a/config/metrics/counts_28d/20210216183703_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183703_fogbugz.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.issue_imports.fogbugz
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of imports from Fogbugz
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183705_phabricator.yml b/config/metrics/counts_28d/20210216183705_phabricator.yml
index ecb92ce04ff..57bf3e5abf3 100644
--- a/config/metrics/counts_28d/20210216183705_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183705_phabricator.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.issue_imports.phabricator
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of imports from Phabricator
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183707_csv.yml b/config/metrics/counts_28d/20210216183707_csv.yml
index 5558447f92c..703edf02f76 100644
--- a/config/metrics/counts_28d/20210216183707_csv.yml
+++ b/config/metrics/counts_28d/20210216183707_csv.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.issue_imports.csv
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of (issue) imports from CSV file
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183709_group_import.yml b/config/metrics/counts_28d/20210216183709_group_import.yml
index 11c9ed4440c..bbe9da3175c 100644
--- a/config/metrics/counts_28d/20210216183709_group_import.yml
+++ b/config/metrics/counts_28d/20210216183709_group_import.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.group_imports.group_import
 description: Number of group import states
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category: ''
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
diff --git a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
index 1314f587438..1a517169eeb 100644
--- a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.group_imports.gitlab_migration
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of groups imported using GitLab Migration
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183712_total.yml b/config/metrics/counts_28d/20210216183712_total.yml
index 280a493e4a7..8942de0f9b8 100644
--- a/config/metrics/counts_28d/20210216183712_total.yml
+++ b/config/metrics/counts_28d/20210216183712_total.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.total
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of all imported projects
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183714_gitlab_project.yml b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
index a4fdaa791b6..e8d1204d428 100644
--- a/config/metrics/counts_28d/20210216183714_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.gitlab_project
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported using Project Import/Export
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183716_gitlab.yml b/config/metrics/counts_28d/20210216183716_gitlab.yml
index 6905da714af..b5ad788c6d0 100644
--- a/config/metrics/counts_28d/20210216183716_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183716_gitlab.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.gitlab
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported using Project Import/Export
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183718_github.yml b/config/metrics/counts_28d/20210216183718_github.yml
index 1ca1658a8ab..a476a103458 100644
--- a/config/metrics/counts_28d/20210216183718_github.yml
+++ b/config/metrics/counts_28d/20210216183718_github.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.github
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from GitHub
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183720_bitbucket.yml b/config/metrics/counts_28d/20210216183720_bitbucket.yml
index 0239d138193..4c3a0bd3721 100644
--- a/config/metrics/counts_28d/20210216183720_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183720_bitbucket.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.bitbucket
 description: Count of projects imported from Bitbucket
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
index 4ccfeaadbb3..82bcde1b2ee 100644
--- a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.bitbucket_server
 description: Count of projects imported from Bitbucket Server
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category: ''
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183724_gitea.yml b/config/metrics/counts_28d/20210216183724_gitea.yml
index 2a383c2c976..df1d3c5b012 100644
--- a/config/metrics/counts_28d/20210216183724_gitea.yml
+++ b/config/metrics/counts_28d/20210216183724_gitea.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.gitea
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from Gitea
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183726_git.yml b/config/metrics/counts_28d/20210216183726_git.yml
index e0f91fbea1e..7e711694253 100644
--- a/config/metrics/counts_28d/20210216183726_git.yml
+++ b/config/metrics/counts_28d/20210216183726_git.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.git
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from Git
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183728_manifest.yml b/config/metrics/counts_28d/20210216183728_manifest.yml
index ba44bc90e64..3c935d604fa 100644
--- a/config/metrics/counts_28d/20210216183728_manifest.yml
+++ b/config/metrics/counts_28d/20210216183728_manifest.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.projects_imported.manifest
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from Git using file Manifest
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183730_jira.yml b/config/metrics/counts_28d/20210216183730_jira.yml
index fd4558506cf..488b4b4c19e 100644
--- a/config/metrics/counts_28d/20210216183730_jira.yml
+++ b/config/metrics/counts_28d/20210216183730_jira.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.issues_imported.jira
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from Jira
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183731_fogbugz.yml b/config/metrics/counts_28d/20210216183731_fogbugz.yml
index 09892145b27..2239c83696d 100644
--- a/config/metrics/counts_28d/20210216183731_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183731_fogbugz.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.issues_imported.fogbugz
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from Fogbugz
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183733_phabricator.yml b/config/metrics/counts_28d/20210216183733_phabricator.yml
index 114fb7ef897..903a06793e1 100644
--- a/config/metrics/counts_28d/20210216183733_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183733_phabricator.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.issues_imported.phabricator
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from Phabricator
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183735_csv.yml b/config/metrics/counts_28d/20210216183735_csv.yml
index c7f0f6c72b9..2890302b24a 100644
--- a/config/metrics/counts_28d/20210216183735_csv.yml
+++ b/config/metrics/counts_28d/20210216183735_csv.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.issues_imported.csv
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of projects imported from CSV file
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183737_groups_imported.yml b/config/metrics/counts_28d/20210216183737_groups_imported.yml
index 64fcdd34904..b2a53befda2 100644
--- a/config/metrics/counts_28d/20210216183737_groups_imported.yml
+++ b/config/metrics/counts_28d/20210216183737_groups_imported.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.groups_imported
-description: ''
+description: Count of imported groups
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category: ''
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml b/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
deleted file mode 100644
index a348b5a9717..00000000000
--- a/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: usage_activity_by_stage_monthly.secure.user_coverage_fuzzing_jobs
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183826_sast_scans.yml b/config/metrics/counts_28d/20210216183826_sast_scans.yml
index 9299f45041c..0f645f5b1d7 100644
--- a/config/metrics/counts_28d/20210216183826_sast_scans.yml
+++ b/config/metrics/counts_28d/20210216183826_sast_scans.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.sast_scans
 description: ''
 product_section: ''
@@ -9,9 +9,10 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml b/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml
index ca3d9284456..386c05ea5b2 100644
--- a/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml
+++ b/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.container_scanning_scans
 description: ''
 product_section: ''
@@ -9,9 +9,10 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183832_dast_scans.yml b/config/metrics/counts_28d/20210216183832_dast_scans.yml
deleted file mode 100644
index b83d5da0f9d..00000000000
--- a/config/metrics/counts_28d/20210216183832_dast_scans.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: usage_activity_by_stage_monthly.secure.dast_scans
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml b/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml
index 55e55c6b4a1..fda980b8252 100644
--- a/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml
+++ b/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.secret_detection_scans
 description: ''
 product_section: ''
@@ -9,9 +9,10 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml b/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
deleted file mode 100644
index aac4dca0667..00000000000
--- a/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: usage_activity_by_stage_monthly.secure.coverage_fuzzing_scans
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml b/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
deleted file mode 100644
index 8986ea82ac8..00000000000
--- a/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: usage_activity_by_stage_monthly.secure.api_fuzzing_scans
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
index ef051f7031e..3987df0e7eb 100644
--- a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: search_unique_visits.search_unique_visits_for_any_target_monthly
 description: Total unique users for i_search_total, i_search_advanced, i_search_paid for recent 28 days. This metric is redundant because advanced will be a subset of paid and paid will be a subset of total. i_search_total is more appropriate if you just want the total
 product_section: enablement
@@ -10,6 +10,12 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_search_total
+    - i_search_advanced
+    - i_search_paid
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
index c526e6bb0f8..fe05044105a 100644
--- a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
+++ b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ide_edit.g_edit_by_sse_monthly
 description: Number of user editing files using the Static Site Editor
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_edit_by_sse
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
index 46bca52fe2b..e47c1d8b729 100644
--- a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.source_code.git_write_action_monthly
 description: Count of unique Git write actions
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - git_write_action
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
index 3b86a4e46fb..be9420ef8cd 100644
--- a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.testing.testing_total_unique_counts_monthly
 description: ''
 product_section: ''
@@ -10,7 +10,22 @@ value_type: number
 status: removed
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_test_case_parsed
+    - i_testing_metrics_report_widget_total
+    - i_testing_group_code_coverage_visit_total
+    - i_testing_full_code_quality_report_total
+    - i_testing_web_performance_widget_total
+    - i_testing_group_code_coverage_project_click_total
+    - i_testing_load_performance_widget_total
+    - i_testing_metrics_report_artifact_uploaders
+    - i_testing_summary_widget_total
+    - users_expanding_testing_code_quality_report
+    - users_expanding_testing_accessibility_report
 distribution:
 - ce
 tier:
 - free
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
index 77386f794ac..7c0bcbb795b 100644
--- a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
+++ b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.snippets.i_snippets_show_monthly
 description: Monthly number of users viewing snippets
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_snippets_show
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
index 19c8fe52d3b..b3b3c7b6749 100644
--- a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
+++ b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: redis_hll_counters.terraform.p_terraform_state_api_unique_users_monthly
 description: Monthly active users of GitLab Managed Terraform states
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_terraform_state_api_unique_users
 distribution:
 - ce
 - ee
@@ -17,3 +21,7 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- smau
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
index cfc5123301f..ca852c74821 100644
--- a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly
 description: Monthly unique user count doing commits which contains the CI config file
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - o_pipeline_authoring_unique_users_committing_ciconfigfile
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
index a1c0a694490..1307111cc3c 100644
--- a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
+++ b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_status_monthly
 description: Count of unique users per month who toggled a task item in a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_toggled_task_item_status
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
index e29924c5f05..a2e858cd886 100644
--- a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_monthly
 description: Count of unique users per month who approve a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_approve_mr
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
index 2c9046c237c..583978e9bd6 100644
--- a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_monthly
 description: Count of unique users per month who unapprove a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_unapprove_mr
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
index c7a8cceb9d3..0828587051e 100644
--- a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_monthly
 description: Count of unique users per month who resolve a thread in a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_resolve_thread
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
index 7efdd71c118..fe195544df4 100644
--- a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_monthly
 description: Count of unique users per month who unresolve a thread in a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_unresolve_thread
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
index 37ba5d3feb6..0bd8573477b 100644
--- a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_monthly
 description: Count of unique users per month who edit the title of a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_edit_mr_title
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
index c36f9bbe167..ba30f3aad30 100644
--- a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
+++ b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_monthly
 description: Count of unique users per month who edit the description of a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_edit_mr_desc
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
index 9d31aafc1db..f948c01170f 100644
--- a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
+++ b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_review_note_monthly
 description: Count of unique users per month who create a note as part of a merge request review
 product_stage: create
@@ -9,10 +9,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_review_note
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
index 41e1b2a1918..478ae4bef09 100644
--- a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_publish_review_monthly
 description: Count of unique users per month who publish their review as part of a merge request review
 product_stage: create
@@ -9,10 +9,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_publish_review
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
index 9054ab2986a..7e5ccc54f67 100644
--- a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_multiline_mr_comment_monthly
 description: Count of unique users per month who create a multiline comment in a merge request
 product_stage: create
@@ -9,10 +9,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_multiline_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
index 649272b492b..59def107ab6 100644
--- a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_edit_multiline_mr_comment_monthly
 description: Count of unique users per week who edit a multiline comment in a merge request
 product_stage: create
@@ -9,10 +9,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_edit_multiline_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
index fbd14f51a67..ec940edea17 100644
--- a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_remove_multiline_mr_comment_monthly
 description: Count of unique users per month who remove a multiline comment in a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_remove_multiline_mr_comment
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
index 705bac961fc..2e4b9bffb9f 100644
--- a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_assigned_monthly
 description: Count of unique users per month who are assigned to a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_assigned
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
index 71f0f150fc5..bf49cac8446 100644
--- a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_marked_as_draft_monthly
 description: Count of unique users per month who mark a merge request as a draft
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_marked_as_draft
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
index abefec023d0..746e9ed6f2f 100644
--- a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_monthly
 description: Count of unique users per month who unmark a merge request as a draft
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_unmarked_as_draft
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
index 7ec7e97225e..a93b38a14ec 100644
--- a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
+++ b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_monthly
 description: Count of unique users per month who request a review of a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_review_requested
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
index 1c081c538a5..fec8c67a6e7 100644
--- a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_monthly
 description: Count of unique users per month who add an approval rule to a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_approval_rule_added
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
index 4fa6ed3886e..c33697d8925 100644
--- a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
+++ b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_deleted_monthly
 description: Count of unique users per month who delete an approval rule to a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_approval_rule_deleted
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
index 6f049c8f04d..c46191814fe 100644
--- a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_edited_monthly
 description: Count of unique users per month who delete an approval rule to a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_approval_rule_edited
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
index 22d442d0d84..d4f72aab3eb 100644
--- a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_monthly
 description: Count of unique users per month who use GitLab Workflow for VS Code
 product_stage: create
@@ -9,10 +9,15 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_vs_code_api_request
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
index cc733cfa149..3a672ceb92f 100644
--- a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue_monthly
 description: Count of unique users per month who create a merge request from an issue
 product_stage: create
@@ -9,6 +9,14 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_mr_from_issue
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_mr
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index 8d3792288c9..2b6e1c978d7 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.code_review_total_unique_counts_monthly
 description: Count of unique users per month who interact with a merge request
 product_stage: create
@@ -9,10 +9,70 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_mr_diffs
+    - i_code_review_user_single_file_diffs
+    - i_code_review_mr_single_file_diffs
+    - i_code_review_user_toggled_task_item_status
+    - i_code_review_user_create_mr
+    - i_code_review_user_close_mr
+    - i_code_review_user_reopen_mr
+    - i_code_review_user_approve_mr
+    - i_code_review_user_unapprove_mr
+    - i_code_review_user_resolve_thread
+    - i_code_review_user_unresolve_thread
+    - i_code_review_edit_mr_title
+    - i_code_review_edit_mr_desc
+    - i_code_review_user_merge_mr
+    - i_code_review_user_create_mr_comment
+    - i_code_review_user_edit_mr_comment
+    - i_code_review_user_remove_mr_comment
+    - i_code_review_user_create_review_note
+    - i_code_review_user_publish_review
+    - i_code_review_user_create_multiline_mr_comment
+    - i_code_review_user_edit_multiline_mr_comment
+    - i_code_review_user_remove_multiline_mr_comment
+    - i_code_review_user_add_suggestion
+    - i_code_review_user_apply_suggestion
+    - i_code_review_user_assigned
+    - i_code_review_user_marked_as_draft
+    - i_code_review_user_unmarked_as_draft
+    - i_code_review_user_review_requested
+    - i_code_review_user_approval_rule_added
+    - i_code_review_user_approval_rule_deleted
+    - i_code_review_user_approval_rule_edited
+    - i_code_review_user_vs_code_api_request
+    - i_code_review_user_create_mr_from_issue
+    - i_code_review_user_mr_discussion_locked
+    - i_code_review_user_mr_discussion_unlocked
+    - i_code_review_user_time_estimate_changed
+    - i_code_review_user_time_spent_changed
+    - i_code_review_user_assignees_changed
+    - i_code_review_user_reviewers_changed
+    - i_code_review_user_milestone_changed
+    - i_code_review_user_labels_changed
+    - i_code_review_click_diff_view_setting
+    - i_code_review_click_single_file_mode_setting
+    - i_code_review_click_file_browser_setting
+    - i_code_review_click_whitespace_setting
+    - i_code_review_diff_view_inline
+    - i_code_review_diff_view_parallel
+    - i_code_review_file_browser_tree_view
+    - i_code_review_file_browser_list_view
+    - i_code_review_diff_show_whitespace
+    - i_code_review_diff_hide_whitespace
+    - i_code_review_diff_single_file
+    - i_code_review_diff_multiple_files
+    - i_code_review_user_load_conflict_ui
+    - i_code_review_user_resolve_conflict
+    - i_code_review_user_searches_diff
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
index 79a064cad59..0f31fe683c6 100644
--- a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_monthly
 description: Count of pipelines with implicit Auto DevOps runs
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_auto_devops
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
index 84166d3edb7..3ac9b6f4ddc 100644
--- a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_build_monthly
 description: Count of pipelines with implicit Auto Build runs
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_auto_devops_build
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
index 170de93af35..ab0fabca342 100644
--- a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_deploy_monthly
 description: Count of pipelines with implicit Auto Deploy runs
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_auto_devops_deploy
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
index 37cb1d072a0..5ad9c37ea8d 100644
--- a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_monthly
 description: ''
 product_section: ''
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_security_sast
 distribution:
 - ce
 tier:
diff --git a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
index 2b45b340aec..31ff83c08fa 100644
--- a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_secret_detection_monthly
 description: ''
 product_section: ''
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_security_secret_detection
 distribution:
 - ce
 tier:
diff --git a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
index 3ad6b97db37..2a0041f589b 100644
--- a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_monthly
 description: Number of projects using 5 min production app CI template in last 7 days.
 product_section: seg
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_5_min_production_app
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
index ee2182d8c83..feb29888b98 100644
--- a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_monthly
 description: Count of pipelines using the Auto DevOps template
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_auto_devops
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
index 471923e85c3..479ae0b65e7 100644
--- a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_cf_deploy_ec2_monthly
 description: "Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml` template in last 28 days."
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_aws_cf_deploy_ec2
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
index 54b5514d8a1..d6e8edfc8f9 100644
--- a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_deploy_ecs_monthly
 description: "Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last 28 days."
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_aws_deploy_ecs
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
index 01e0fbe81b2..04b087c2b63 100644
--- a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_build_monthly
 description: Count of pipelines using the Auto Build template
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_auto_devops_build
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
index c6f9087c9bc..c5f24824bde 100644
--- a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_monthly
 description: Count of pipelines using the stable Auto Deploy template
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_auto_devops_deploy
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
index 2fd81cd64af..baac103aae1 100644
--- a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_latest_monthly
 description: Count of pipelines using the latest Auto Deploy template
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_auto_devops_deploy_latest
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
index 2938236ef56..0e072188e2a 100644
--- a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_monthly
 description: ''
 product_section: ''
@@ -10,8 +10,13 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_security_sast
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
index 15e28870d11..7e9f5151a23 100644
--- a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_security_secret_detection_monthly
 description: ''
 product_section: ''
@@ -10,8 +10,13 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_security_secret_detection
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
index 3bfa045b833..063b9e7c582 100644
--- a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_latest_monthly
 description: Count of pipelines that include the terraform base template from GitLab
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_terraform_base_latest
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index e3f418abaa2..c036b506ac5 100644
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_monthly
 description: Total count of pipelines runs
 product_section: ops
@@ -11,6 +11,24 @@ status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332466
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_auto_devops
+    - p_ci_templates_implicit_auto_devops_build
+    - p_ci_templates_implicit_auto_devops_deploy
+    - p_ci_templates_implicit_security_sast
+    - p_ci_templates_implicit_security_secret_detection
+    - p_ci_templates_5_min_production_app
+    - p_ci_templates_auto_devops
+    - p_ci_templates_aws_cf_deploy_ec2
+    - p_ci_templates_aws_deploy_ecs
+    - p_ci_templates_auto_devops_build
+    - p_ci_templates_auto_devops_deploy
+    - p_ci_templates_auto_devops_deploy_latest
+    - p_ci_templates_security_sast
+    - p_ci_templates_security_secret_detection
+    - p_ci_templates_terraform_base_latest
 distribution:
 - ce
 - ee
@@ -18,4 +36,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
index 82c1717e3cf..de5acc6a60c 100644
--- a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.quickactions_total_unique_counts_monthly
 description: Count of MAU using one or more quick actions
 product_section: dev
@@ -10,6 +10,77 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_approve
+    - i_quickactions_assign_single
+    - i_quickactions_assign_multiple
+    - i_quickactions_assign_self
+    - i_quickactions_assign_reviewer
+    - i_quickactions_award
+    - i_quickactions_board_move
+    - i_quickactions_child_epic
+    - i_quickactions_clear_weight
+    - i_quickactions_clone
+    - i_quickactions_close
+    - i_quickactions_confidential
+    - i_quickactions_copy_metadata_merge_request
+    - i_quickactions_copy_metadata_issue
+    - i_quickactions_create_merge_request
+    - i_quickactions_done
+    - i_quickactions_draft
+    - i_quickactions_due
+    - i_quickactions_duplicate
+    - i_quickactions_epic
+    - i_quickactions_estimate
+    - i_quickactions_iteration
+    - i_quickactions_label
+    - i_quickactions_lock
+    - i_quickactions_merge
+    - i_quickactions_milestone
+    - i_quickactions_move
+    - i_quickactions_parent_epic
+    - i_quickactions_promote
+    - i_quickactions_publish
+    - i_quickactions_reassign
+    - i_quickactions_reassign_reviewer
+    - i_quickactions_rebase
+    - i_quickactions_relabel
+    - i_quickactions_relate
+    - i_quickactions_remove_child_epic
+    - i_quickactions_remove_due_date
+    - i_quickactions_remove_epic
+    - i_quickactions_remove_estimate
+    - i_quickactions_remove_iteration
+    - i_quickactions_remove_milestone
+    - i_quickactions_remove_parent_epic
+    - i_quickactions_remove_time_spent
+    - i_quickactions_remove_zoom
+    - i_quickactions_reopen
+    - i_quickactions_severity
+    - i_quickactions_shrug
+    - i_quickactions_spend_subtract
+    - i_quickactions_spend_add
+    - i_quickactions_submit_review
+    - i_quickactions_subscribe
+    - i_quickactions_tableflip
+    - i_quickactions_tag
+    - i_quickactions_target_branch
+    - i_quickactions_title
+    - i_quickactions_todo
+    - i_quickactions_unassign_specific
+    - i_quickactions_unassign_all
+    - i_quickactions_unassign_reviewer
+    - i_quickactions_unlabel_specific
+    - i_quickactions_unlabel_all
+    - i_quickactions_unlock
+    - i_quickactions_unsubscribe
+    - i_quickactions_weight
+    - i_quickactions_wip
+    - i_quickactions_zoom
+    - i_quickactions_invite_email_single
+    - i_quickactions_invite_email_multiple
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
index 52256b10097..27893e9a72c 100644
--- a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_composer_deploy_token_monthly
 description: A monthly count of Composer packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
index adc89858093..f5b4a753ca3 100644
--- a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_conan_deploy_token_monthly
 description: A monthly count of Conan packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_conan_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
index 3b6951db697..3da9fd8a073 100644
--- a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_container_deploy_token_monthly
 description: A monthly count of container images published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_container_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
index b1685bc86bf..5bddca4b70e 100644
--- a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_debian_deploy_token_monthly
 description: A monthly count of Debian packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_debian_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
index a852830bd40..4bf549b2653 100644
--- a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_generic_deploy_token_monthly
 description: A monthly count of generic packages published to the registry using a deploy token
 product_section: ops
@@ -11,6 +11,10 @@ status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331455
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_generic_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
index a7d1fdc1271..61bc69c172a 100644
--- a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_golang_deploy_token_monthly
 description: A monthly count of Go modules published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_golang_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
index 415d136fadc..d231688f191 100644
--- a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_maven_deploy_token_monthly
 description: A monthly count of Maven packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_maven_deploy_token
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
index 10e3d154698..df745333d71 100644
--- a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_npm_deploy_token_monthly
 description: A monthly count of npm packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_npm_deploy_token
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
index ea9d0c6434c..063530e82ac 100644
--- a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_nuget_deploy_token_monthly
 description: A monthly count of NuGet packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_nuget_deploy_token
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
index 5e840499c9e..256689b29a8 100644
--- a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_pypi_deploy_token_monthly
 description: A monthly count of PyPI packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_pypi_deploy_token
 distribution:
 - ee
 - ce
@@ -17,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
index 9e96d08b8eb..52be708f794 100644
--- a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_tag_deploy_token_monthly
 description: A monthly count of package tags published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_tag_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
index 007a0087173..5452e4399d5 100644
--- a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.deploy_token_packages_total_unique_counts_monthly
 description: A monthly count of packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,23 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_deploy_token
+    - i_package_conan_deploy_token
+    - i_package_container_deploy_token
+    - i_package_debian_deploy_token
+    - i_package_generic_deploy_token
+    - i_package_golang_deploy_token
+    - i_package_helm_deploy_token
+    - i_package_maven_deploy_token
+    - i_package_npm_deploy_token
+    - i_package_nuget_deploy_token
+    - i_package_pypi_deploy_token
+    - i_package_rubygems_deploy_token
+    - i_package_tag_deploy_token
+    - i_package_terraform_module_deploy_token
 distribution:
 - ee
 - ce
@@ -17,3 +34,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
index 9c7f0a48d2c..4d0c59d2568 100644
--- a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_composer_user_monthly
 description: A monthly count of users that have published a Composer package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_user
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
index f4f53f344d3..83adab11d09 100644
--- a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_conan_user_monthly
 description: A monthly count of users that have published a Conan package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_conan_user
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
index d480e8eacf6..a0072e65314 100644
--- a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_container_user_monthly
 description: A monthly count of users that have published a container image to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_container_user
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
index 2683628049d..22e7a1f432a 100644
--- a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_debian_user_monthly
 description: A monthly count of users that have published a Debian package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_debian_user
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
index 903f9f8b146..7072e6542b8 100644
--- a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_generic_user_monthly
 description: A monthly count of users that have published a generic package to the registry
 product_section: ops
@@ -11,6 +11,10 @@ status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331455
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_generic_user
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
index 0c559a16839..7303436fe3f 100644
--- a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_golang_user_monthly
 description: A monthly count of users that have published a Go moduleto the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_golang_user
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
index fbf543ab69b..c4f13984dc9 100644
--- a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_maven_user_monthly
 description: A monthly count of users that have published a Maven package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_maven_user
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
index 8b73015fbfb..637de10004e 100644
--- a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_npm_user_monthly
 description: A monthly count of users that have published an npm package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_npm_user
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
index 4df4da25bb3..5a2f03a7b31 100644
--- a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_nuget_user_monthly
 description: A monthly count of users that have published a NuGet package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_nuget_user
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
index f8047de893d..fefa5363e25 100644
--- a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_pypi_user_monthly
 description: A monthly count of users that have published a PyPI package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_pypi_user
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
index f39cb56f015..9c339dae78e 100644
--- a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_tag_user_monthly
 description: A monthly count of users that have published a package tag to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_tag_user
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
index 826c7e660e6..59d588c543f 100644
--- a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: redis_hll_counters.user_packages.user_packages_total_unique_counts_monthly
 description: A monthly count of users that have published a package to the registry
 product_section: ops
@@ -10,6 +10,23 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_user
+    - i_package_conan_user
+    - i_package_container_user
+    - i_package_debian_user
+    - i_package_generic_user
+    - i_package_golang_user
+    - i_package_helm_user
+    - i_package_maven_user
+    - i_package_npm_user
+    - i_package_nuget_user
+    - i_package_pypi_user
+    - i_package_rubygems_user
+    - i_package_tag_user
+    - i_package_terraform_module_user
 distribution:
 - ee
 - ce
@@ -17,3 +34,6 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- smau
+- gmau
diff --git a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
index 10f02ffec9c..070a2cd71c3 100644
--- a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_close_issue_monthly
 description: Number of users closing Jira issues by month
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_jira_service_close_issue
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
index 9c32f66fba6..dd977ce2f4d 100644
--- a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
+++ b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_cross_reference_monthly
 description: Number of users that cross-referenced Jira issues by month
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_jira_service_cross_reference
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
index 76452c300b7..33d805a0905 100644
--- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
@@ -1,15 +1,31 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.ecosystem_total_unique_counts_monthly
-description: Number of users performing actions on Jira issues by month
+description: Number of users for Jira and Slack by month
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_jira_service_close_issue
+    - i_ecosystem_jira_service_cross_reference
+    - i_ecosystem_jira_service_list_issues
+    - i_ecosystem_jira_service_create_issue
+    - i_ecosystem_slack_service_issue_notification
+    - i_ecosystem_slack_service_push_notification
+    - i_ecosystem_slack_service_deployment_notification
+    - i_ecosystem_slack_service_wiki_page_notification
+    - i_ecosystem_slack_service_merge_request_notification
+    - i_ecosystem_slack_service_note_notification
+    - i_ecosystem_slack_service_tag_push_notification
+    - i_ecosystem_slack_service_confidential_note_notification
+    - i_ecosystem_slack_service_confidential_issue_notification
 distribution:
 - ce
 - ee
@@ -17,3 +33,6 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
index 6c66ac6b52e..0ed31fa36d7 100644
--- a/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
+++ b/config/metrics/counts_28d/20210222041219_i_quickactions_invite_email_single_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_single_monthly
 description: Unique users using the /invite_email quick action to add a single email participant to an issue within 28 days
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_invite_email_single
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
index a3bcc3732a1..e7e6ecd5d3c 100644
--- a/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
+++ b/config/metrics/counts_28d/20210222041235_i_quickactions_invite_email_multiple_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_multiple_monthly
 description: Unique users using the /invite_email quick action to add a multiple email participants to an issue within 28 days
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_invite_email_multiple
 distribution:
 - ce
 tier:
diff --git a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
index 5dcd06ba0bb..c6447db3ccb 100644
--- a/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210301102134_i_code_review_user_time_estimate_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_time_estimate_changed_monthly
 description: Count of unique users per month who changed time estimate of a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_time_estimate_changed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
index 431c3459aee..277060a93a9 100644
--- a/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210301102204_i_code_review_user_time_spent_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_time_spent_changed_monthly
 description: Count of unique users per month who changed time spent on a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_time_spent_changed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml b/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
index 35311eb3d03..e9b8ac665ac 100644
--- a/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210301103859_i_code_review_user_mr_discussion_locked_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_mr_discussion_locked_monthly
 description: Count of unique users per month who locked a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55069
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_mr_discussion_locked
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml b/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
index a7c127bbce8..b1380590eb2 100644
--- a/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210301103925_i_code_review_user_mr_discussion_unlocked_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_mr_discussion_unlocked_monthly
 description: Count of unique users per month who unlocked a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55069
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_mr_discussion_unlocked
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
index 20bc2888444..3f71aff89d5 100644
--- a/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210301144228_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_monthly
 description: Monthly unique user count having merge requests which contains the CI config file
 product_section: ops
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54707
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
 distribution:
 - ce
 - ee
@@ -19,3 +23,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
index a0364f3b662..e5530f3a5de 100644
--- a/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302110520_i_code_review_user_milestone_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_milestone_changed_monthly
 description: Count of unique users per month who changed milestone of a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55484
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_milestone_changed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml b/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
index f3172ea968a..7ce83b31a76 100644
--- a/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302110607_i_code_review_user_labels_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_labels_changed_monthly
 description: Count of unique users per month who changed labels of a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55484
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_labels_changed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml b/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
index 134273d95e0..c0dd76951a5 100644
--- a/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302114145_i_code_review_user_assignees_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_assignees_changed_monthly
 description: Count of unique users per month who changed assignees of a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55486
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_assignees_changed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml b/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
index e89aff85ae8..60ad9493fee 100644
--- a/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210302114219_i_code_review_user_reviewers_changed_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_reviewers_changed_monthly
 description: Count of unique users per month who changed reviewers of a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55486
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_reviewers_changed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
index 7982e5c2080..61bacd93dd1 100644
--- a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_issue_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing an action on an issue by month
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_issue_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
index 58a19c976ef..2741c56f551 100644
--- a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_push_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing a Git push by month
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_push_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
index a496c23f27a..42ec4cb35d4 100644
--- a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_deployment_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing a deployment by month
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_deployment_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
index 4fd3024a123..270409ed250 100644
--- a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_wiki_page_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by month
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_wiki_page_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
index cca179d85d9..aee3342e1e0 100644
--- a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_merge_request_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing an action on a merge request by month
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_merge_request_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
index 373207882e6..9aa3fa248dc 100644
--- a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_note_notification_monthly
 description: Calculated unique users to trigger a Slack message by creating a note by month
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_note_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
index deffb8604b2..5144abd28ed 100644
--- a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_tag_push_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing a tag push by month
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_tag_push_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
index c6d22aeee3a..530f26aefa3 100644
--- a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_note_notification_monthly
 description: Calculated unique users to trigger a Slack message by creating a confidential note by month
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_confidential_note_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
index 5ffe284e566..10e5deefae6 100644
--- a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_issue_notification_monthly
 description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by month
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_confidential_issue_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
index 5084e954108..608cb715558 100644
--- a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_rubygems_deploy_token_monthly
 description: Distinct count events for RubyGems packages published using a Deploy token in recent 28 days
 product_section: ops
@@ -12,6 +12,10 @@ milestone: '13.10'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53480
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_rubygems_deploy_token
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
index 1058ace0ae5..2a9d959abba 100644
--- a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
+++ b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_rubygems_user_monthly
 description: Distinct user count of RubyGems packages published in recent 28 days
 product_section: ops
@@ -12,6 +12,10 @@ milestone: '13.10'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53480
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_rubygems_user
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
index 58f8c709d3f..18c3f96be6a 100644
--- a/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409095855_users_expanding_secure_security_report_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.secure.users_expanding_secure_security_report_monthly
 description: Count of expanding the security report widget
 product_section: sec
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_secure_security_report
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
index d993b1a1ce7..d9b6ad05ac6 100644
--- a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.testing.users_expanding_testing_code_quality_report_monthly
 description: Count of expanding the code quality widget
 product_section: ops
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_testing_code_quality_report
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
index 01d6512d124..3767fedeb86 100644
--- a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.testing.users_expanding_testing_accessibility_report_monthly
 description: Count of expanding the accessibility report widget
 product_section: ops
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_testing_accessibility_report
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
index 5eaeda70733..e5c895e7997 100644
--- a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_terraform_module_deploy_token_monthly
 description: Number of distinct users authorized via deploy token creating Terraform Module packages in recent 28 days
 product_section: ops
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_terraform_module_deploy_token
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
index 89b39d7052f..2dfc10652ea 100644
--- a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
+++ b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_terraform_module_user_monthly
 description: Number of distinct users creating Terraform Module packages in recent 28 days
 product_section: ops
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_terraform_module_user
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
index 8e2da49198b..e71f298b992 100644
--- a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
+++ b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.testing.i_testing_summary_widget_total_monthly
 description: Unique users that expand the test summary merge request widget by month
 product_section: ops
@@ -12,6 +12,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_summary_widget_total
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
index 720cc6bba79..5fea551038a 100644
--- a/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421144352_i_code_review_click_single_file_mode_setting_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_click_single_file_mode_setting_monthly
 description: Count of users clicking single file mode setting
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_click_single_file_mode_setting
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
index bfc1995721d..6a1b63c25f7 100644
--- a/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421145818_i_code_review_click_file_browser_setting_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_click_file_browser_setting_monthly
 description: Count of users clicking merge request file browser setting
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_click_file_browser_setting
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
index 39d4ec1ccd9..f8d978844a9 100644
--- a/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210421145945_i_code_review_click_whitespace_setting_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_click_whitespace_setting_monthly
 description: Count of users clicking merge request whitespae setting
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_click_whitespace_setting
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
index 75b02d2c1ef..d86772cea6b 100644
--- a/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
+++ b/config/metrics/counts_28d/20210422101516_i_code_review_diff_view_inline_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_diff_view_inline_monthly
 description: Count of users with merge request view type as inline
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_diff_view_inline
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
index 0e621ecc2e1..d3d2889dfa3 100644
--- a/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
+++ b/config/metrics/counts_28d/20210422101613_i_code_review_diff_view_parallel_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_diff_view_parallel_monthly
 description: Count of users with merge request view type as parallel
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_diff_view_parallel
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
index 3f92cc19b40..55fe49b2639 100644
--- a/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
+++ b/config/metrics/counts_28d/20210422101753_i_code_review_file_browser_tree_view_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_file_browser_tree_view_monthly
 description: Count of users with merge request file tree setting
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_file_browser_tree_view
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
index 5062c9a3540..d26aa837f26 100644
--- a/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
+++ b/config/metrics/counts_28d/20210422101852_i_code_review_file_browser_list_view_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_file_browser_list_view_monthly
 description: Count of users with merge request file list setting
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_file_browser_list_view
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
index e0ea4b403f0..06a8b55ff62 100644
--- a/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
+++ b/config/metrics/counts_28d/20210422101928_i_code_review_diff_show_whitespace_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_diff_show_whitespace_monthly
 description: Count of users with show whitespace enabled
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_diff_show_whitespace
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
index 6afdaf4040e..6095e9ec05d 100644
--- a/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
+++ b/config/metrics/counts_28d/20210422102010_i_code_review_diff_hide_whitespace_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_monthly
 description: Count of users with show whitespace disabled
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_diff_hide_whitespace
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
index c06852f1ceb..58c7aafd9de 100644
--- a/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
+++ b/config/metrics/counts_28d/20210422102121_i_code_review_diff_single_file_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_diff_single_file_monthly
 description: Count of users with single file mode enabled
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_diff_single_file
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
index d3ab117e0d8..9af4cab1e87 100644
--- a/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
+++ b/config/metrics/counts_28d/20210422102202_i_code_review_diff_multiple_files_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_diff_multiple_files_monthly
 description: Count of users with single mode disabled
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_diff_multiple_files
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
index c5a8796d0c7..d341ce11ec4 100644
--- a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -1,18 +1,18 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.aggregated_metrics.code_review_category_monthly_active_users
 name: "0"
-description:
-product_section:
-product_stage:
-product_group:
-product_category:
+description: 
+product_section: 
+product_stage: 
+product_group: 
+product_category: 
 value_type: number
 status: data_available
 milestone: "13.12"
-introduced_by_url:
+introduced_by_url: 
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
index 5dba13c4339..e263777a2dd 100644
--- a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
@@ -1,18 +1,18 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.aggregated_metrics.code_review_extension_category_monthly_active_users
 name: "0"
-description:
-product_section:
-product_stage:
-product_group:
-product_category:
+description: 
+product_section: 
+product_stage: 
+product_group: 
+product_category: 
 value_type: number
 status: data_available
 milestone: "13.12"
-introduced_by_url:
+introduced_by_url: 
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
index 2a9c92b0840..fbe5fba73be 100644
--- a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
@@ -1,18 +1,18 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.aggregated_metrics.code_review_group_monthly_active_users
 name: "0"
-description:
-product_section:
-product_stage:
-product_group:
-product_category:
+description: 
+product_section: 
+product_stage: 
+product_group: 
+product_category: 
 value_type: number
 status: data_available
 milestone: "13.12"
-introduced_by_url:
+introduced_by_url: 
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
index 2d2b9fd4fe8..eda0f937450 100644
--- a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_counts_monthly
 name: "0"
 description:
@@ -12,7 +12,12 @@ status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 28d
-data_source:
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - o_pipeline_authoring_unique_users_committing_ciconfigfile
+    - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml b/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
index 66589c662c5..c74b28e0546 100644
--- a/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
+++ b/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml
@@ -1,18 +1,18 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.enablement.geo_secondary_web_oauth_users
 name: ""
-description:
-product_section:
-product_stage:
-product_group:
-product_category:
+description: 
+product_section: 
+product_stage: 
+product_group: 
+product_category: 
 value_type: number
 status: data_available
 milestone: "13.12"
-introduced_by_url:
+introduced_by_url: 
 time_frame: 28d
-data_source:
+data_source: 
 distribution:
 - ce
 - ee
@@ -21,3 +21,6 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type:
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
index 0ebdabe70af..596063e4a43 100644
--- a/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
+++ b/config/metrics/counts_28d/20210514013545_i_code_review_user_resolve_conflict_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_resolve_conflict_monthly
 name: resolve_conflict
 description: Count of unique users per week who attempt to resolve a conflict through the ui
@@ -12,6 +12,10 @@ status: data_available
 milestone: "13.12"
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_resolve_conflict
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61654
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
index 9e27c5d1ad4..c793a2887d8 100644
--- a/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
+++ b/config/metrics/counts_28d/20210514013549_i_code_review_user_load_conflict_ui_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_load_conflict_ui_monthly
 name: load_conflict_ui
 description: Count of unique users per week who load the conflict resolution page
@@ -12,6 +12,10 @@ status: data_available
 milestone: "13.12"
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_load_conflict_ui
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61654
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
index 47b33835640..abf16d3dee9 100644
--- a/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
+++ b/config/metrics/counts_28d/20210514141518_monthly_projects_creation.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_monthly.projects
 description: 'Count number of projects created monthly'
 product_section: dev
diff --git a/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
index 1560e2ba43d..266c5b1cad8 100644
--- a/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_helm_deploy_token_monthly
 description: Distinct Helm pakages deployed in recent 28 days
 product_section: ops
@@ -12,6 +12,10 @@ milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61014
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_helm_deploy_token
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
index ec903822901..0226e885fe7 100644
--- a/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_helm_user_monthly
 description: Distinct user count events for Helm packages in recent 28 days
 product_section: ops
@@ -12,6 +12,10 @@ milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61014
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_helm_user
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210520111133_total.yml b/config/metrics/counts_28d/20210520111133_total.yml
index 770edde3753..9470b6f1dff 100644
--- a/config/metrics/counts_28d/20210520111133_total.yml
+++ b/config/metrics/counts_28d/20210520111133_total.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.project_imports.total
 description: Total count of projects imported
 product_section: dev
diff --git a/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml b/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
index 89ab784a6a2..4a3ec6eb8f2 100644
--- a/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
+++ b/config/metrics/counts_28d/20210607113556_i_code_review_click_diff_view_setting_monthly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_click_diff_view_setting_monthly
 description: Count of users clicking diff view setting
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_click_diff_view_setting
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml b/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
new file mode 100644
index 00000000000..8b48a623045
--- /dev/null
+++ b/config/metrics/counts_28d/20210720144005_i_code_review_user_searches_diff_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_searches_diff_monthly
+description: Count of users who search merge request diffs
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '14.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66522
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_searches_diff
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml b/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
new file mode 100644
index 00000000000..f23300c3a52
--- /dev/null
+++ b/config/metrics/counts_28d/20210721042227_i_quickactions_severity_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_severity_monthly
+description: Count of MAU using the `/severity` quick action
+product_section: ops
+product_stage: monitor
+product_group: group::monitor
+product_category: incident_management
+value_type: number
+status: implemented
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66422
+time_frame: 28d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_severity
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index f671827b165..48e72f62caf 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
 description: Count of WAU editing an issue title
 product_stage: plan
@@ -11,6 +11,10 @@ milestone: "13.6"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_title_changed
 distribution:
 - ee
 - ce
@@ -18,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
index 4a069e68145..fbce567f299 100644
--- a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
+++ b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
@@ -1,16 +1,21 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.analytics.i_analytics_instance_statistics_weekly
 description: Unique visitors to /admin/usage_trends by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_analytics_instance_statistics
 distribution:
 - ee
 tier: []
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
index 1a5886b8d49..d35ea4076d7 100644
--- a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -1,16 +1,37 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.analytics.analytics_total_unique_counts_weekly
 description: The number of unique users who visited any analytics feature by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_viewing_analytics_group_devops_adoption
+    - i_analytics_dev_ops_adoption
+    - i_analytics_dev_ops_score
+    - p_analytics_merge_request
+    - i_analytics_instance_statistics
+    - g_analytics_contribution
+    - g_analytics_insights
+    - g_analytics_issues
+    - g_analytics_productivity
+    - g_analytics_valuestream
+    - p_analytics_pipelines
+    - p_analytics_code_reviews
+    - p_analytics_valuestream
+    - p_analytics_insights
+    - p_analytics_issues
+    - p_analytics_repo
+    - i_analytics_cohorts
 distribution:
 - ee
 tier: []
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
index 24ac0a96342..004b24b0d0e 100644
--- a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.source_code.merge_request_action_weekly
 description: Count of unique users who perform an action on a merge request
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - merge_request_action
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
index e5e1b1f7ed3..e712a02c27d 100644
--- a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.source_code.i_source_code_code_intelligence_weekly
 description: Count of unique users who use code intelligence
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_source_code_code_intelligence
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
index f62235853e3..7c27eff7b75 100644
--- a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_mr_diffs_weekly
 description: Count of unique merge requests per week with diffs viewed
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_mr_diffs
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
index df2f021f07c..8430bb9c1ad 100644
--- a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_single_file_diffs_weekly
 description: Count of unique users per week with diffs viewed file by file
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_single_file_diffs
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
index bd58ea45c74..c6d312cac70 100644
--- a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
@@ -1,8 +1,7 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_mr_single_file_diffs_weekly
-description: Count of unique merge requests per week with diffs viewed file
-  by file
+description: Count of unique merge requests per week with diffs viewed file by file
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -11,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_mr_single_file_diffs
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
index 13ae581e63b..92a7035b685 100644
--- a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_weekly
 description: Count of unique users per week who created a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
index 8d772114c26..c336a950746 100644
--- a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_close_mr_weekly
 description: Count of unique users per week who closed a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_close_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
index 6a7c6772d12..c4e59d2dcdb 100644
--- a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_reopen_mr_weekly
 description: Count of unique users per week who reopened a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_reopen_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
index cdb10c77bd4..635681cc47c 100644
--- a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_merge_mr_weekly
 description: Count of unique users per week who merged a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_merge_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
index 564af0eb72b..064367405c8 100644
--- a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_comment_weekly
 description: Count of unique users per week who commented on a MR
 product_section: dev
@@ -10,10 +10,19 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_mr_comment
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
index 0b8a269de01..783c456c379 100644
--- a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_edit_mr_comment_weekly
 description: Count of unique users per week who edited a comment on a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_edit_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
index 115a699f700..8e0dc5b31a6 100644
--- a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_remove_mr_comment_weekly
 description: Count of unique users per month who removed a comment on a MR
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_remove_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
index 1975ab36cf0..57fd33f2e22 100644
--- a/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
+++ b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_add_suggestion_weekly
 description: Count of unique users per week who added a suggestion
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_add_suggestion
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
index f188681b7e6..4e34212e9cb 100644
--- a/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
+++ b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_apply_suggestion_weekly
 description: Count of unique users per week who applied a suggestion
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_apply_suggestion
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
index 71aa5985af7..90840faf43d 100644
--- a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ide_edit.g_edit_by_web_ide_weekly
 description: Weekly number of users editing using the Web IDE
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_edit_by_web_ide
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
index ad6ed7d1093..0e7720ee8b3 100644
--- a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
+++ b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ide_edit.g_edit_by_sfe_weekly
 description: Weekly number of users editing from the single file editor
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_edit_by_sfe
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
index 25cb8ce505f..3bd141fbfcc 100644
--- a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ide_edit.g_edit_by_snippet_ide_weekly
 description: Weekly number of users editing Snippets
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_edit_by_snippet_ide
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
index 606a5dbbea2..6b5b8d8914e 100644
--- a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ide_edit.ide_edit_total_unique_counts_weekly
 description: Weekly number of users editing a file using the Web IDE
 product_section: dev
@@ -10,6 +10,13 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_edit_by_web_ide
+  - g_edit_by_sfe
+  - g_edit_by_snippet_ide
+  - g_edit_by_sse
 distribution:
 - ce
 - ee
@@ -17,3 +24,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
index af0ba376863..e7146cf8158 100644
--- a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
+++ b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.search.i_search_total_weekly
 description: Calculated unique users to perform Basic or Advanced searches by week
 product_section: enablement
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_search_total
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
index fb889331ead..c27b8be56ee 100644
--- a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.search.search_total_unique_counts_weekly
 description: Calculated unique users to perform Basic or Advanced searches by week
 product_section: enablement
@@ -10,6 +10,12 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_search_total
+  - i_search_advanced
+  - i_search_paid
 distribution:
 - ee
 - ce
@@ -17,3 +23,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
index 13e01bf4a3e..628956629fc 100644
--- a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_weekly.aggregated_metrics.incident_management_alerts_total_unique_counts
 description: Count of unique users per week to take an action on an alert
 product_section: ops
diff --git a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
index 25711f674b9..bfdc0410d2b 100644
--- a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_weekly.aggregated_metrics.incident_management_incidents_total_unique_counts
 description: Count of unique users per week to take an action on an incident
 product_section: ops
diff --git a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
index 87259fa97fe..903a1da1f1f 100644
--- a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_alert_status_changed_weekly
 description: Count of unique users changing alert's status per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_alert_status_changed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
index f4c3c1eb1e9..98546cb7a84 100644
--- a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_alert_assigned_weekly
 description: Count of unique users assigning an alert per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_alert_assigned
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
index 04764533ffe..25c54267179 100644
--- a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_alert_todo_weekly
 description: Count of unique users adding alerts to the TODO list per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_alert_todo
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
index 8bd376c8d0e..79abe8e9459 100644
--- a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_created_weekly
 description: Count of unique users creating incidents  per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_incident_created
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
index c9c7ea0e28a..718faa29b4a 100644
--- a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_reopened_weekly
 description: Count of unique users reopening incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_incident_reopened
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
index 3f0042c3f89..e04baa14a93 100644
--- a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_closed_weekly
 description: Count of users closing incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_incident_closed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
index 3b84275a572..47919052937 100644
--- a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_assigned_weekly
 description: Count of unique users assiging incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_incident_assigned
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
index 7f5432e205a..6bb7e389b86 100644
--- a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_todo_weekly
 description: Count of unique users adding incidents to the TODO list per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_incident_todo
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
index 02ddf7986bc..cfc02a494fd 100644
--- a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_comment_weekly
 description: Count of unique users adding comments on incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_incident_comment
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
index a372b9e068e..9e3f16ea2db 100644
--- a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
+++ b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_zoom_meeting_weekly
 description: Count of unique users creating Zoom meetings about incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_incident_zoom_meeting
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
index a08dd85c39c..8b4e93fe938 100644
--- a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_relate_weekly
 description: Count of unique users adding issues per that are related to an incident week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_incident_relate
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
index f618155abb7..dab3f0a5611 100644
--- a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_unrelate_weekly
 description: Count of unique users removing issue that are related to an incident per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_incident_unrelate
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
index 724370ed549..5ef90c0269a 100644
--- a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_change_confidential_weekly
 description: Count of unique users changing incidents to confidential per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_incident_change_confidential
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
index ab49f7e70e6..f8b657e27b7 100644
--- a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
@@ -1,15 +1,32 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_total_unique_counts_weekly
 description: Count of unique users performing events related to the incident management
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_incident_created
+  - incident_management_incident_reopened
+  - incident_management_incident_closed
+  - incident_management_incident_assigned
+  - incident_management_incident_todo
+  - incident_management_incident_comment
+  - incident_management_incident_zoom_meeting
+  - incident_management_incident_published
+  - incident_management_incident_relate
+  - incident_management_incident_unrelate
+  - incident_management_incident_change_confidential
+  - incident_management_alert_status_changed
+  - incident_management_alert_assigned
+  - incident_management_alert_todo
 distribution:
 - ce
 - ee
@@ -17,3 +34,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
index 61d7875b205..fc6dbd18b32 100644
--- a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
+++ b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.incident_management_alerts.incident_management_alert_create_incident_weekly
 description: Count of unique users per week to create an incident corresponding to
   an alert
@@ -11,6 +11,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - incident_management_alert_create_incident
 distribution:
 - ce
 - ee
@@ -18,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
index 79407c70dd5..67721c0f081 100644
--- a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_description_changed_weekly
 description: Count of WAU editing an issue description
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_description_changed
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
index 4281d78ae7d..3b24f3d43ee 100644
--- a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_assignee_changed_weekly
 description: Count of WAU changing issue assignees
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_assignee_changed
 distribution:
 - ce
 - ee
 tier:
-- free 
-- premium 
-- ultimate 
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
index f3a6812cf6d..a1d3ebb2770 100644
--- a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_confidential_weekly
 description: Count of WAU making an issue confidential
 product_section: dev
@@ -10,11 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_made_confidential
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate 
-
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
index ad7fdda5984..eda1f51f2a1 100644
--- a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
+++ b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_made_visible_weekly
 description: Count of WAU making an issue not confidential
 product_section: dev
@@ -10,11 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_made_visible
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate 
-
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
index 8d1bed247b9..8c4037fd1db 100644
--- a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_created_weekly
 description: Count of WAU creating issues
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_created
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
index 34a0e306822..41dca2aac8d 100644
--- a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_closed_weekly
 description: Count of WAU closing an issue
 product_section: dev
@@ -10,11 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_closed
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
index 37df169972c..5ceedd15a2f 100644
--- a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_reopened_weekly
 description: Count of WAU re-opening a closed issue
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_reopened
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
index 437d115fadd..8df9757fc1e 100644
--- a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_label_changed_weekly
 description: Count of WAU changing an issue's label
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_label_changed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
index b51f8afc673..6ce7c5fa822 100644
--- a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_milestone_changed_weekly
 description: Count of WAU changing an issue's milestone
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_milestone_changed
 distribution:
 - ce
 - ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index 3bfb7aae868..0cd55b58aa0 100644
--- a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_cross_referenced_weekly
 description: Count of WAU referencing an issue from somewhere else
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_cross_referenced
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
index e42797908c4..5ce80d42f33 100644
--- a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
+++ b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_moved_weekly
 description: Count of WAU moving an issue to another project
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_moved
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
index d98f25c1b20..7291567e17f 100644
--- a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
+++ b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_related_weekly
 description: Count of WAU relating an issue to another issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_related
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
index c88a0eabefa..b7abc40eb9f 100644
--- a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
+++ b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_unrelated_weekly
 description: Count of WAU unrelating an issue to another issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_unrelated
 distribution:
 - ce
 - ee
@@ -17,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
index a633eadcea2..c661beb585f 100644
--- a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_marked_as_duplicate_weekly
 description: Count of WAU marking an issue as a duplicate
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_marked_as_duplicate
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
index a1423d961c8..99cfc654a63 100644
--- a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_locked_weekly
 description: Count of WAU locking an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_locked
 distribution:
 - ce
 - ee
@@ -17,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
index cdc010c89d3..17754a930fb 100644
--- a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_unlocked_weekly
 description: Count of WAU unlocking an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_unlocked
 distribution:
 - ce
 - ee
@@ -17,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
index 6128830827f..2bc0b001482 100644
--- a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_added_weekly
 description: Count of WAU adding a design to an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_designs_added
 distribution:
 - ce
 - ee
@@ -17,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
index 06a0481802c..162e8e91c7b 100644
--- a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
+++ b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_modified_weekly
 description: Count of WAU modifying a design on an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_designs_modified
 distribution:
 - ce
 - ee
@@ -17,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
index f6c0e1fac84..829f7610001 100644
--- a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_designs_removed_weekly
 description: Count of WAU removing a design from an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_designs_removed
 distribution:
 - ce
 - ee
@@ -17,5 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
index 1405f7966cc..b5fa673f35a 100644
--- a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_due_date_changed_weekly
 description: Count of WAU changing an issue due date
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_due_date_changed
 distribution:
 - ce
 - ee
@@ -17,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
index 88617905463..e855dec21e8 100644
--- a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_estimate_changed_weekly
 description: Count of WAU changing an issue time estimate
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_time_estimate_changed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
index ef16ec406d9..e7d071731db 100644
--- a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_time_spent_changed_weekly
 description: Count of WAU recording time spent on an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_time_spent_changed
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
index 3c89bb79fdf..76d60040879 100644
--- a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_added_weekly
 description: Count of WAU commenting on an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_comment_added
 distribution:
 - ce
 - ee
@@ -17,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
index ad7f4adb5ea..d0c8fd5c863 100644
--- a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_edited_weekly
 description: Count of WAU editing a comment on an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_comment_edited
 distribution:
 - ce
 - ee
@@ -17,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
index edc1b2efc59..8dace3f5ed4 100644
--- a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_comment_removed_weekly
 description: Count of WAU deleting a comment from an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_comment_removed
 distribution:
 - ce
 - ee
@@ -17,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
index 85b12d6af6b..3a5a3b6c3b6 100644
--- a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
+++ b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_cloned_weekly
 description: Count of WAU cloning an issue
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_cloned
 distribution:
 - ce
 - ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
index 2dcb9cb42c8..6e016fabbba 100644
--- a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.issues_edit.issues_edit_total_unique_counts_weekly
 description: Aggregate count of WAU taking an action related to an issue
 product_section: dev
@@ -10,6 +10,42 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_project_management_issue_title_changed
+  - g_project_management_issue_description_changed
+  - g_project_management_issue_assignee_changed
+  - g_project_management_issue_made_confidential
+  - g_project_management_issue_made_visible
+  - g_project_management_issue_created
+  - g_project_management_issue_closed
+  - g_project_management_issue_reopened
+  - g_project_management_issue_label_changed
+  - g_project_management_issue_milestone_changed
+  - g_project_management_issue_iteration_changed
+  - g_project_management_issue_weight_changed
+  - g_project_management_issue_cross_referenced
+  - g_project_management_issue_moved
+  - g_project_management_issue_related
+  - g_project_management_issue_unrelated
+  - g_project_management_issue_marked_as_duplicate
+  - g_project_management_issue_locked
+  - g_project_management_issue_unlocked
+  - g_project_management_issue_added_to_epic
+  - g_project_management_issue_removed_from_epic
+  - g_project_management_issue_changed_epic
+  - g_project_management_issue_designs_added
+  - g_project_management_issue_designs_modified
+  - g_project_management_issue_designs_removed
+  - g_project_management_issue_due_date_changed
+  - g_project_management_issue_time_estimate_changed
+  - g_project_management_issue_time_spent_changed
+  - g_project_management_issue_comment_added
+  - g_project_management_issue_comment_edited
+  - g_project_management_issue_comment_removed
+  - g_project_management_issue_health_status_changed
+  - g_project_management_issue_cloned
 distribution:
 - ce
 - ee
@@ -17,3 +53,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
index 4ef1a406ce0..0ed6dc80f0b 100644
--- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_approve_weekly
 description: Count of WAU using the `/approve` quick action
 product_section: dev
@@ -14,6 +14,10 @@ instrumentation_class: RedisHLLMetric
 options:
   events:
     - i_quickactions_approve
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_approve
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
index a32968621af..a7a3ec1ad95 100644
--- a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
+++ b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_single_weekly
 description: Count of WAU using the `/assign @user1` quick action to assign a single individual to an issuable 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_single
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
index 034394c338a..a5115aff30f 100644
--- a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
+++ b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_self_weekly
 description: Count of WAU using the `/assign me` quick action to assign self to an issuable 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_self
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
index ddeb9b88df8..c38a8df55d8 100644
--- a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_reviewer_weekly
 description: Count of WAU using the `/assign_reviewer` or `request_reviewer` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_assign_reviewer
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
index f002171bf96..38bf53b85c7 100644
--- a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
+++ b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_award_weekly
 description: Count of WAU using the `/award` quick action to set an award emoji on an issuable 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_award
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
index 05012ed36d8..8f250a3f9d6 100644
--- a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_board_move_weekly
 description: Count of WAU using the `/board_move` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_board_move
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
index f7fbf7e722a..4c7e9a65640 100644
--- a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_clone_weekly
 description: Count of WAU using the `/clone` quick action to clone an issue.
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_clone
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
index 3fb5f7f2504..0abd261a955 100644
--- a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
+++ b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_close_weekly
 description: Count of WAU using the `/close` quick action to close an issuable
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_close
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
index 7119cec2083..923c8acdb38 100644
--- a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_confidential_weekly
 description: Count of WAU using the `/confidential` quick action to set an issue as confidential
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_confidential
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
index a317c83e75e..38ed29c54d0 100644
--- a/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_merge_request_weekly
 description: Count of WAU using the `/copy_metadata` quick action on a Merge Request
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_copy_metadata_merge_request
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
index 39495ccca3c..2358d4409b9 100644
--- a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_copy_metadata_issue_weekly
 description: Count of WAU using the `/copy_metadata` quick action on an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_copy_metadata_issue
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
index f6c15cf447a..35eecec2be2 100644
--- a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_create_merge_request_weekly
 description: Count of WAU using the `/create_merge_request` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_create_merge_request
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
index a079996d0b2..575992ebb56 100644
--- a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
+++ b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_done_weekly
 description: Count of WAU using the `/done` quick action to mark a todo as done
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_done
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
index edba1aa2ca3..dff8845d13e 100644
--- a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_draft_weekly
 description: Count of WAU using the `/draft` quick action on a Merge Request
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_draft
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
index 91b47b48d6a..269b20a85f4 100644
--- a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
+++ b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_due_weekly
 description: Count of WAU using the `/due` quick action to change the due date on an issuable 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_due
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
index 29a485623c3..0b4d121e7f1 100644
--- a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_duplicate_weekly
 description: Count of WAU using the `/duplicate` quick action to mark an issue as a duplicate of another
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_duplicate
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
index 4a6f7b6db71..7a48efa232f 100644
--- a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_estimate_weekly
 description: Count of WAU using the `/estimate` quick action to set a time estimate on an issue
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_estimate
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
index 6380019b823..0106fe73fb7 100644
--- a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
+++ b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_label_weekly
 description: Count of WAU using the `/label` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_label
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
index fc19bfc5aba..05baed74083 100644
--- a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_lock_weekly
 description: Count of WAU using the `/lock` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_lock
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
index 72344d83c3c..4f71a2b34a2 100644
--- a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
+++ b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_merge_weekly
 description: Count of WAU using the `/merge` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_merge
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
index cbc0a5cb301..070b1a8fcea 100644
--- a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_milestone_weekly
 description: Count of WAU using the `/milestone` quick action 
 product_section: dev 
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_milestone
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
index 8aa6aa0c2f2..2523ac9d6bc 100644
--- a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_move_weekly
 description: Count of WAU using the `/move` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_move
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
index e461d58c499..abc657df3c2 100644
--- a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
+++ b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reassign_weekly
 description: Count of WAU using the `/reassign @user1` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_reassign
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
index e8b81447916..951e97973cf 100644
--- a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reassign_reviewer_weekly
 description: Count of WAU using the `/reassign_reviewer` quick action
 product_section: dev
@@ -10,11 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_reassign_reviewer
 distribution:
 - ce
 - ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
 
diff --git a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
index 7c65f6868bf..d43e975f900 100644
--- a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
+++ b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_rebase_weekly
 description: Count of WAU using the `/rebase` quick action on a Merge Request
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_rebase
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
index a8ac0715b22..cd0ef13cf14 100644
--- a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
+++ b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_relabel_weekly
 description: Count of WAU using the `/relabel` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_relabel
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
index e7e396da7fc..f6076e328a8 100644
--- a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_relate_weekly
 description: Count of WAU using the `/relate` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_relate
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
index b934268b88e..2111cb5f388 100644
--- a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
+++ b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_due_date_weekly
 description: Count of WAU using the `/remove_due_date` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_due_date
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
index e18ae759715..69035a5cd2f 100644
--- a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_weekly
 description: Count of WAU using the `/remove_estimate` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_estimate
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
index 6d783572976..4dffc94c782 100644
--- a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_weekly
 description: Count of WAU using the `/remove_milestone` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_milestone
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
index 86458cb813f..83ade2edb86 100644
--- a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
+++ b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_time_spent_weekly
 description: Count of WAU using the `/remove_time_spent` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_time_spent
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
index eff4a6bc9eb..bd3beb71a63 100644
--- a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_weekly
 description: Count of WAU using the `/remove_zoom` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_remove_zoom
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
index a64b3eec3b4..4b861cf2767 100644
--- a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
+++ b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reopen_weekly
 description: Count of WAU using the `/reopen` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_reopen
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
index dcbb2ce8aaa..b9f858890da 100644
--- a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
+++ b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_shrug_weekly
 description: Count of WAU using the `/shrug` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_shrug
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
index 1752363a6e6..95ca954f425 100644
--- a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
+++ b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_subtract_weekly
 description: Count of WAU using the `/spend` quick action to subtract time spent 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_spend_subtract
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
index 478b32079e7..5b96c328208 100644
--- a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
+++ b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_add_weekly
 description: Count of WAU using the `/spend` quick action to add time spent 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_spend_add
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
index 3e02aebcf62..61738f62506 100644
--- a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_submit_review_weekly
 description: Count of WAU using the `/submit_review` quick action on Merge Requests
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_submit_review
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
index 0d5b43552fe..819b314862d 100644
--- a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_weekly
 description: Count of WAU using the `/subscribe` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_subscribe
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
index 3725e008de5..490dd5f3dce 100644
--- a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_weekly
 description: Count of WAU using the `/tableflip` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_tableflip
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
index b2983522af5..52ffe59604e 100644
--- a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
+++ b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tag_weekly
 description: Count of WAU using the `/tag` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_tag
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
index 03c3a7fd3ae..8a7a20e0168 100644
--- a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
+++ b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_target_branch_weekly
 description: Count of WAU using the `/target_branch` quick action on Merge Requests
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_target_branch
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
index 67cf9ffadf2..5d390130bcf 100644
--- a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_title_weekly
 description: Count of WAU using the `/title` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_title
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
index 2732afe133a..62c2ecadc39 100644
--- a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_todo_weekly
 description: Count of WAU using the `/todo` quick action 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_todo
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
index 8a1b27e26c9..a3bed5449c9 100644
--- a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_specific_weekly
 description: Count of WAU using the `/unassign @user1` quick action on Merge Requests
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unassign_specific
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
index d772d842803..41b6b77e73b 100644
--- a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_all_weekly
 description: Count of WAU using the `/unassign` quick action on Merge Requests
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unassign_all
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
index 5d8182c97a6..ffcd580673e 100644
--- a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_reviewer_weekly
 description: Count of WAU using the `/unassign_reviewer` or `/remove_reviewer` quick action on Merge Requests
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unassign_reviewer
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
index 823d3c64177..5ce812bd6ec 100644
--- a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_specific_weekly
 description: Count of WAU using the `/unlabel` or `/remove_label` quick action to remove one or more specific labels
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unlabel_specific
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
index 3e16e38d814..b78f9ca8ef9 100644
--- a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_all_weekly
 description: Count of WAU using the `/unlabel` quick action to remove all labels
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unlabel_all
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
index e89b4b48b82..57b310903f3 100644
--- a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlock_weekly
 description: Count of WAU using the `/unlock` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unlock
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
index cbce70d915e..a105958e4a1 100644
--- a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unsubscribe_weekly
 description: Count of WAU using the `/unsubscribe` quick action
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_unsubscribe
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
index 72e438d2227..25e8f4be9ea 100644
--- a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_wip_weekly
 description: Count of WAU using the `/wip` quick action on Merge Requests
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_wip
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
index 783565854e8..5a39c45b49b 100644
--- a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_zoom_weekly
 description: Count of WAU using the `/zoom` quick action on Issues 
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_zoom
 distribution:
 - ce
 - ee 
diff --git a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
index ea8ebc2b18f..e82cd9f475b 100644
--- a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.source_code.wiki_action_weekly
 description: Count of unique actions done on a wiki (create, edit, delete)
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - wiki_action
 distribution:
-- ee
+- ce
 - ee
 tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
index 34cd3645bfe..476ec404822 100644
--- a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.source_code.design_action_weekly
 description: Count of total design actions (upload, delete, comment, reply)
 product_section: dev
@@ -10,10 +10,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - design_action
 distribution:
-- ee
+- ce
 - ee
 tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
index 95919f7919c..db7052b12ef 100644
--- a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.source_code.project_action_weekly
 description: Count of unique actions done on projects and related resources (create, edit, delete, comment)
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - project_action
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
index c7ce2c729e1..d03fd57da15 100644
--- a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
+++ b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.testing.i_testing_test_case_parsed_weekly
 description: Internal Tracking to count number of unit tests parsed for planning of
   future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
@@ -11,6 +11,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_testing_test_case_parsed
 distribution:
 - ee
 - ce
@@ -18,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
index 12530d0be66..98bcd975333 100644
--- a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_weekly.aggregated_metrics.product_analytics_test_metrics_union
 description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
 product_section: growth
diff --git a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
index 117be73d66f..bfd8f27de07 100644
--- a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_weekly.aggregated_metrics.product_analytics_test_metrics_intersection
 description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature
 product_section: growth
diff --git a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
index 9c5823b3e7c..abde6514c0d 100644
--- a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
+++ b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ide_edit.g_edit_by_sse_weekly
 description: Weekly number of users editing using the Static Site Editor
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_edit_by_sse
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
index baf098dd19b..3e2c55c64a5 100644
--- a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.source_code.git_write_action_weekly
 description: Count of unique Git write actions
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - git_write_action
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
index 21cbad1ae90..ad3c78880b6 100644
--- a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
+++ b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.snippets.i_snippets_show_weekly
 description: Weekly number of users viewing snippets
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_snippets_show
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
index f032e8a8558..34c7a54c61a 100644
--- a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
+++ b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly
 description: Weekly unique user count doing commits which contains the CI config file
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - o_pipeline_authoring_unique_users_committing_ciconfigfile
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
index dfd86a89531..8d67335f0d2 100644
--- a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
+++ b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_toggled_task_item_status_weekly
 description: Count of unique users per week who toggled a task item in a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_toggled_task_item_status
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
index aa377215ccf..14eb2ace2fb 100644
--- a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approve_mr_weekly
 description: Count of unique users per week who approve a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_approve_mr
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
index df529bd5a02..ba26fdb3d6f 100644
--- a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_unapprove_mr_weekly
 description: Count of unique users per week who unapprove a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_unapprove_mr
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
index 05fbef8aa3c..7aed369c9b0 100644
--- a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_resolve_thread_weekly
 description: Count of unique users per week who resolve a thread in a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_resolve_thread
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
index e6a44c96fd4..77e7b6a2ffd 100644
--- a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_unresolve_thread_weekly
 description: Count of unique users per week who unresolve a thread in a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_unresolve_thread
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
index ecbfced908e..2676804eab8 100644
--- a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_edit_mr_title_weekly
 description: Count of unique users per week who edit the title of a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_edit_mr_title
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
index 75cc991fcdc..7195b41324c 100644
--- a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
+++ b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_edit_mr_desc_weekly
 description: Count of unique users per week who edit the description of a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_edit_mr_desc
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
index b2da2ef75b1..0f1b9370ac8 100644
--- a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
+++ b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_review_note_weekly
 description: Count of unique users per week who create a note as part of a merge request review
 product_stage: create
@@ -9,10 +9,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_review_note
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
index bbbf03fe665..2228aacdfac 100644
--- a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_publish_review_weekly
 description: Count of unique users per week who publish their review as part of a merge request review
 product_stage: create
@@ -9,10 +9,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_publish_review
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
index 094246b285c..5874320eaa6 100644
--- a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_multiline_mr_comment_weekly
 description: Count of unique users per week who create a multiline comment in a merge request
 product_stage: create
@@ -9,10 +9,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_multiline_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
index f9942bdf336..77da5c512dd 100644
--- a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_edit_multiline_mr_comment_weekly
 description: Count of unique users per week who edit a multiline comment in a merge request
 product_stage: create
@@ -9,10 +9,15 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_edit_multiline_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
index e80cd9600be..a84bf25dc3b 100644
--- a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_remove_multiline_mr_comment_weekly
 description: Count of unique users per week who remove a multiline comment in a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_remove_multiline_mr_comment
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
index c3468ebdc66..8dcb7355259 100644
--- a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_assigned_weekly
 description: Count of unique users per week who are assigned to a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_assigned
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
index 67b23dad449..d629ff47e6a 100644
--- a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_marked_as_draft_weekly
 description: Count of unique users per week who mark a merge request as a draft
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_marked_as_draft
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
index 0684c51dfab..a9ca86c9c89 100644
--- a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_weekly
 description: Count of unique users per week who unmark a merge request as a draft
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_unmarked_as_draft
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
index bcee92c4764..1f048cc0ab5 100644
--- a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
+++ b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_review_requested_weekly
 description: Count of unique users per week who request a review of a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_review_requested
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
index 3705c1e782d..3880ed061b0 100644
--- a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_added_weekly
 description: Count of unique users per week who add an approval rule to a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_approval_rule_added
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
index c01eca8df05..d11f0e03d57 100644
--- a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
+++ b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_deleted_weekly
 description: Count of unique users per week who delete an approval rule to a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_approval_rule_deleted
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
index 470c80e147e..f07a6b8084f 100644
--- a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_edited_weekly
 description: Count of unique users per week who edit an approval rule to a merge request
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_approval_rule_edited
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
index 3dff97bda92..a583b1a1ad7 100644
--- a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_weekly
 description: Count of unique users per week who use GitLab Workflow for VS Code
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_vs_code_api_request
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
index 40b9601282e..3147fe6d7a6 100644
--- a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue_weekly
 description: Count of unique users per week who create a merge request from an issue
 product_stage: create
@@ -9,6 +9,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_mr_from_issue
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index d629bdf63e3..ddd40581db4 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.code_review_total_unique_counts_weekly
 description: Count of unique users per week who interact with a merge request
 product_stage: create
@@ -9,10 +9,70 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_mr_diffs
+    - i_code_review_user_single_file_diffs
+    - i_code_review_mr_single_file_diffs
+    - i_code_review_user_toggled_task_item_status
+    - i_code_review_user_create_mr
+    - i_code_review_user_close_mr
+    - i_code_review_user_reopen_mr
+    - i_code_review_user_approve_mr
+    - i_code_review_user_unapprove_mr
+    - i_code_review_user_resolve_thread
+    - i_code_review_user_unresolve_thread
+    - i_code_review_edit_mr_title
+    - i_code_review_edit_mr_desc
+    - i_code_review_user_merge_mr
+    - i_code_review_user_create_mr_comment
+    - i_code_review_user_edit_mr_comment
+    - i_code_review_user_remove_mr_comment
+    - i_code_review_user_create_review_note
+    - i_code_review_user_publish_review
+    - i_code_review_user_create_multiline_mr_comment
+    - i_code_review_user_edit_multiline_mr_comment
+    - i_code_review_user_remove_multiline_mr_comment
+    - i_code_review_user_add_suggestion
+    - i_code_review_user_apply_suggestion
+    - i_code_review_user_assigned
+    - i_code_review_user_marked_as_draft
+    - i_code_review_user_unmarked_as_draft
+    - i_code_review_user_review_requested
+    - i_code_review_user_approval_rule_added
+    - i_code_review_user_approval_rule_deleted
+    - i_code_review_user_approval_rule_edited
+    - i_code_review_user_vs_code_api_request
+    - i_code_review_user_create_mr_from_issue
+    - i_code_review_user_mr_discussion_locked
+    - i_code_review_user_mr_discussion_unlocked
+    - i_code_review_user_time_estimate_changed
+    - i_code_review_user_time_spent_changed
+    - i_code_review_user_assignees_changed
+    - i_code_review_user_reviewers_changed
+    - i_code_review_user_milestone_changed
+    - i_code_review_user_labels_changed
+    - i_code_review_click_diff_view_setting
+    - i_code_review_click_single_file_mode_setting
+    - i_code_review_click_file_browser_setting
+    - i_code_review_click_whitespace_setting
+    - i_code_review_diff_view_inline
+    - i_code_review_diff_view_parallel
+    - i_code_review_file_browser_tree_view
+    - i_code_review_file_browser_list_view
+    - i_code_review_diff_show_whitespace
+    - i_code_review_diff_hide_whitespace
+    - i_code_review_diff_single_file
+    - i_code_review_diff_multiple_files
+    - i_code_review_user_load_conflict_ui
+    - i_code_review_user_resolve_conflict
+    - i_code_review_user_searches_diff
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
index 93a0b2b1e6a..01155a1c0e0 100644
--- a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_weekly
 description: Number of projects using 5 min production app CI template in last 7 days.
 product_section: seg
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_5_min_production_app
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
index bb6ef10ac48..822006bc84d 100644
--- a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_cf_deploy_ec2_weekly
 description: "Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml` template in last 7 days."
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_aws_cf_deploy_ec2
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
index dc08b474904..5c027842d63 100644
--- a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_deploy_ecs_weekly
 description: "Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last 7 days."
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_aws_deploy_ecs
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index 2025f9fa64c..9edb43b3aee 100644
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ci_templates.ci_templates_total_unique_counts_weekly
 description: Total count of pipelines runs
 product_section: ops
@@ -11,6 +11,24 @@ status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332466
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_auto_devops
+    - p_ci_templates_implicit_auto_devops_build
+    - p_ci_templates_implicit_auto_devops_deploy
+    - p_ci_templates_implicit_security_sast
+    - p_ci_templates_implicit_security_secret_detection
+    - p_ci_templates_5_min_production_app
+    - p_ci_templates_auto_devops
+    - p_ci_templates_aws_cf_deploy_ec2
+    - p_ci_templates_aws_deploy_ecs
+    - p_ci_templates_auto_devops_build
+    - p_ci_templates_auto_devops_deploy
+    - p_ci_templates_auto_devops_deploy_latest
+    - p_ci_templates_security_sast
+    - p_ci_templates_security_secret_detection
+    - p_ci_templates_terraform_base_latest
 distribution:
 - ce
 - ee
@@ -18,4 +36,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
index 88c55330def..7d918a5a496 100644
--- a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_composer_deploy_token_weekly
 description: A weekly count of Composer packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
index 9885ecabc44..13e5875fc49 100644
--- a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_conan_deploy_token_weekly
 description: A weekly count of Conan packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_conan_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
index f96fcbd6e8e..1b930e244ed 100644
--- a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_container_deploy_token_weekly
 description: A weekly count of container images published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_container_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
index 49bd4018846..daf1268d021 100644
--- a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_debian_deploy_token_weekly
 description: A weekly count of Debian packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_debian_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
index b508344d827..82900f13262 100644
--- a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_generic_deploy_token_weekly
 description: A weekly count of generic packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_generic_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
index 06538828958..73993965b14 100644
--- a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_golang_deploy_token_weekly
 description: A weekly count of Go modules published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_golang_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
index cf195eee842..33ccf6b94c2 100644
--- a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_maven_deploy_token_weekly
 description: A weekly count of Maven packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_maven_deploy_token
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
index cbe8915fd43..295258be202 100644
--- a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_npm_deploy_token_weekly
 description: A weekly count of npm packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_npm_deploy_token
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
index f0e19bd65a7..849f1541c78 100644
--- a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_nuget_deploy_token_weekly
 description: A weekly count of NuGet packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_nuget_deploy_token
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
index ec2383abcec..4e74098a20c 100644
--- a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_pypi_deploy_token_weekly
 description: A weekly count of Python packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_pypi_deploy_token
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
index 9e9bb850987..35cb4ed18cd 100644
--- a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_tag_deploy_token_weekly
 description: A weekly count of users that have published a package tag to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_tag_deploy_token
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
index b0ae90703c1..584e56510e9 100644
--- a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.deploy_token_packages_total_unique_counts_weekly
 description: A weekly count of packages published to the registry using a deploy token
 product_section: ops
@@ -10,6 +10,23 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_deploy_token
+    - i_package_conan_deploy_token
+    - i_package_container_deploy_token
+    - i_package_debian_deploy_token
+    - i_package_generic_deploy_token
+    - i_package_golang_deploy_token
+    - i_package_helm_deploy_token
+    - i_package_maven_deploy_token
+    - i_package_npm_deploy_token
+    - i_package_nuget_deploy_token
+    - i_package_pypi_deploy_token
+    - i_package_rubygems_deploy_token
+    - i_package_tag_deploy_token
+    - i_package_terraform_module_deploy_token
 distribution:
 - ee
 - ce
@@ -17,3 +34,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
index b5462f5afa4..09514b747fa 100644
--- a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_composer_user_weekly
 description: A weekly count of users that have published a Composer package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_user
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
index 625f0ee8839..6038b6a7460 100644
--- a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_conan_user_weekly
 description: A weekly count of users that have published a Conan package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_conan_user
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
index 2f2acedfebe..795982a8c63 100644
--- a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_container_user_weekly
 description: A weekly count of users that have published a container image to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_container_user
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
index 7ba0cb93c43..9cc704c46fd 100644
--- a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_debian_user_weekly
 description: A weekly count of users that have published a Debian package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_debian_user
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
index ce8820ccc87..8e8198a5fcd 100644
--- a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_generic_user_weekly
 description: A weekly count of users that have published a generic package to the registry
 product_section: ops
@@ -11,6 +11,10 @@ status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331455
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_generic_user
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
index fed1dcb357a..f331fccc178 100644
--- a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_golang_user_weekly
 description: A weekly count of users that have published a Go module to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_golang_user
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
index f14ac4a7acf..a79ce0401c5 100644
--- a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_maven_user_weekly
 description: A weekly count of users that have published a Maven package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_maven_user
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
index d98430a800e..5eb7c85ad1b 100644
--- a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_npm_user_weekly
 description: A weekly count of users that have published an npm package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_npm_user
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
index 2170cc9c973..e8ead65cf92 100644
--- a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_nuget_user_weekly
 description: A weekly count of users that have published a NuGet package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_nuget_user
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
index 91a23455379..19d099eb677 100644
--- a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_pypi_user_weekly
 description: A weekly count of users that have published a Python package to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_pypi_user
 distribution:
 - ee
 - ce
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
index a7dd78aca70..aa65fc12daa 100644
--- a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_tag_user_weekly
 description: A weekly count of users that have published a package with a tag to the registry
 product_section: ops
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_tag_user
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
index 86a165f9d30..d7e35fb52eb 100644
--- a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.user_packages_total_unique_counts_weekly
 description: A weekly count of users that have published a package to the registry
 product_section: ops
@@ -10,6 +10,23 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_user
+    - i_package_conan_user
+    - i_package_container_user
+    - i_package_debian_user
+    - i_package_generic_user
+    - i_package_golang_user
+    - i_package_helm_user
+    - i_package_maven_user
+    - i_package_npm_user
+    - i_package_nuget_user
+    - i_package_pypi_user
+    - i_package_rubygems_user
+    - i_package_tag_user
+    - i_package_terraform_module_user
 distribution:
 - ee
 - ce
@@ -17,3 +34,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
index 1c8a9679fa7..45b42df9a58 100644
--- a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_close_issue_weekly
 description: Number of users closing Jira issues by week
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_jira_service_close_issue
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
index 1a76c1c69fd..bcd142629ec 100644
--- a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
+++ b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
@@ -1,15 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_cross_reference_weekly
 description: Number of users that cross-referenced Jira issues by week
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_jira_service_cross_reference
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
index 8f1ca0fb40c..109e4b0ac0a 100644
--- a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
@@ -1,15 +1,31 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.ecosystem_total_unique_counts_weekly
 description: Number of users performing actions on Jira issues by week
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_jira_service_close_issue
+    - i_ecosystem_jira_service_cross_reference
+    - i_ecosystem_jira_service_list_issues
+    - i_ecosystem_jira_service_create_issue
+    - i_ecosystem_slack_service_issue_notification
+    - i_ecosystem_slack_service_push_notification
+    - i_ecosystem_slack_service_deployment_notification
+    - i_ecosystem_slack_service_wiki_page_notification
+    - i_ecosystem_slack_service_merge_request_notification
+    - i_ecosystem_slack_service_note_notification
+    - i_ecosystem_slack_service_tag_push_notification
+    - i_ecosystem_slack_service_confidential_note_notification
+    - i_ecosystem_slack_service_confidential_issue_notification
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
index c0fe97815d9..d5ae76cfb97 100644
--- a/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
+++ b/config/metrics/counts_7d/20210301144209_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile_weekly
 description: Weekly unique user count having merge requests which contains the CI config file
 product_section: ops
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54707
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
index 83d68d739a4..3049dc64068 100644
--- a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_issue_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing an action on an issue by week
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_issue_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
index c8d7354cb9b..42817360fb6 100644
--- a/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302103539_i_code_review_user_time_estimate_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_time_estimate_changed_weekly
 description: Count of unique users per week who changed time estimate of a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_time_estimate_changed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
index 08cc03a78ae..6acc51a14ee 100644
--- a/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302103615_i_code_review_user_time_spent_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_time_spent_changed_weekly
 description: Count of unique users per week who changed time spent on a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55046
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_time_spent_changed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
index 14a590de64a..55cb6bcbcb2 100644
--- a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_push_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing a Git push by week
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_push_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
index 6859319d83a..76c34c102b1 100644
--- a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_deployment_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing a deployment by week
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_deployment_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
index 8307e3a3099..0a223b45493 100644
--- a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_wiki_page_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing an action on a wiki page by week
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_wiki_page_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
index 250cfc6506e..d7e05f2672a 100644
--- a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_merge_request_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing an action on a merge request by week
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_merge_request_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
index 6ee4f87b7ba..4ee7fc088d0 100644
--- a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_note_notification_weekly
 description: Calculated unique users to trigger a Slack message by creating a note by week
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_note_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
index 8b2fbd61c44..938ca77e933 100644
--- a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_tag_push_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing a tag push by week
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_tag_push_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
index 2edbc10c9c4..1b8fb7a47e1 100644
--- a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_note_notification_weekly
 description: Calculated unique users to trigger a Slack message by creating a confidential note by week
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_confidential_note_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
index cac5da84490..09fbb902bc7 100644
--- a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_slack_service_confidential_issue_notification_weekly
 description: Calculated unique users to trigger a Slack message by performing an action on a confidential issue by week
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_confidential_issue_notification
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml b/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
index 30a2cb6b367..b3704a4232a 100644
--- a/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210302105258_i_code_review_user_mr_discussion_unlocked_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_mr_discussion_unlocked_weekly
 description: Count of unique users per week who unlocked a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55069
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_mr_discussion_unlocked
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml b/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
index c4bb5e47a1f..aaba247ea02 100644
--- a/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210302105318_i_code_review_user_mr_discussion_locked_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_mr_discussion_locked_weekly
 description: Count of unique users per week who locked a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55069
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_mr_discussion_locked
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
index abe346f1942..eed67a4cda6 100644
--- a/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302110403_i_code_review_user_milestone_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_milestone_changed_weekly
 description: Count of unique users per week who changed milestone of a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55484
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_milestone_changed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml b/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
index 57ddf4ac3c2..b003c999c23 100644
--- a/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302110548_i_code_review_user_labels_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_labels_changed_weekly
 description: Count of unique users per week who changed labels of a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55484
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_labels_changed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml b/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
index 1b5fd14efb7..57a1a8bf307 100644
--- a/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302114202_i_code_review_user_assignees_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_assignees_changed_weekly
 description: Count of unique users per week who changed assignees of a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55486
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_assignees_changed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml b/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
index 33b8c06fb93..bd792b7cb7b 100644
--- a/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210302114235_i_code_review_user_reviewers_changed_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_reviewers_changed_weekly
 description: Count of unique users per week who changed reviewers of a MR
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55486
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_reviewers_changed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
index 6acc548b2e7..b0f1ceebbfd 100644
--- a/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
+++ b/config/metrics/counts_7d/20210303154557_i_quickactions_invite_email_single_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_single_weekly
 description: Unique users using the /invite_email quick action to add a single email participant to an issue within 7 days
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_invite_email_single
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
index 944b5102af2..da29ef10c7f 100644
--- a/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
+++ b/config/metrics/counts_7d/20210303154600_i_quickactions_invite_email_multiple_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_invite_email_multiple_weekly
 description: Unique users using the /invite_email quick action to add a multiple email participants to an issue within 7 days
 product_section: dev
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49264
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_invite_email_multiple
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
index caa19531176..c4218863207 100644
--- a/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_rubygems_deploy_token_weekly
 description: A weekly count of distinct RubyGems packages published using a deploy token
 product_section: ops
@@ -12,6 +12,10 @@ milestone: '13.10'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53480
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_rubygems_deploy_token
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
index 013ac9ecb14..8d4027cd86e 100644
--- a/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
+++ b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_rubygems_user_weekly
 description: A weekly count of distinct RubyGems packages published by a user
 product_section: ops
@@ -12,6 +12,10 @@ milestone: '13.10'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53480
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_rubygems_user
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
index f4ade05ed51..c8ad3b64364 100644
--- a/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409095855_users_expanding_secure_security_report_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.secure.users_expanding_secure_security_report_weekly
 description: Count of expanding the security report widget
 product_section: sec
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_secure_security_report
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
index 11aad6e8af1..278bd1691cd 100644
--- a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.testing.users_expanding_testing_code_quality_report_weekly
 description: Count of expanding the code quality widget
 product_section: ops
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_testing_code_quality_report
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
index b6929fd771f..3cde67e9c1e 100644
--- a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.testing.users_expanding_testing_accessibility_report_weekly
 description: Count of expanding the accessibility report widget
 product_section: ops
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_testing_accessibility_report
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
index 0dd6837c8b8..d68d290e662 100644
--- a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_terraform_module_deploy_token_weekly
 description: Number of distinct users authorized via deploy token creating Terraform Module packages in recent 7 days
 product_section: ops
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_terraform_module_deploy_token
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
index 94a310dbac4..f78f2276183 100644
--- a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
+++ b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_terraform_module_user_weekly
 description: Number of distinct users creating Terraform Module packages in recent 7 days
 product_section: ops
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_terraform_module_user
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
index 44597d4910b..96994ba0dc2 100644
--- a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
+++ b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.testing.i_testing_summary_widget_total_weekly
 description: Unique users that expand the test summary merge request widget by week
 product_section: ops
@@ -12,6 +12,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_summary_widget_total
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
index b4aeac34554..ec3e664e464 100644
--- a/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_click_single_file_mode_setting_weekly
 description: Count of users clicking single file mode setting
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_click_single_file_mode_setting
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
index 56f03ad3b13..eed8def8793 100644
--- a/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_click_file_browser_setting_weekly
 description: Count of users with merge request file list setting
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_click_file_browser_setting
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
index 8fae98e5705..354e2e01443 100644
--- a/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_click_whitespace_setting_weekly
 description: Count of users clicking merge request whitespae setting
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_click_whitespace_setting
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
index 5e15350bd1e..4332d62b411 100644
--- a/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
+++ b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_diff_view_inline_weekly
 description: Count of users with merge request view type as inline
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_diff_view_inline
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
index c16bd2b5db5..21f757638d3 100644
--- a/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
+++ b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_diff_view_parallel_weekly
 description: Count of users with merge request view type as parallel
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_diff_view_parallel
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
index abaaa79d3e8..03d83daa800 100644
--- a/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
+++ b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_file_browser_tree_view_weekly
 description: Count of users with merge request file tree setting
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_file_browser_tree_view
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
index 3f7e646cf83..ea6ce090c2f 100644
--- a/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
+++ b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_file_browser_list_view_weekly
 description: Count of users with merge request file list setting
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_file_browser_list_view
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
index 0966c15bdd5..2042dc2bcca 100644
--- a/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
+++ b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_diff_show_whitespace_weekly
 description: Count of users with show whitespace enabled
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_diff_show_whitespace
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
index f987b89f778..2104698319e 100644
--- a/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
+++ b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_diff_hide_whitespace_weekly
 description: Count of users with show whitespace disabled
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_diff_hide_whitespace
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
index ac02305439d..2e11afbf0c5 100644
--- a/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
+++ b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_diff_single_file_weekly
 description: Count of users with single file mode enabled
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_diff_single_file
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
index 3cb400fcb05..99e470b7a9b 100644
--- a/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
+++ b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_diff_multiple_files_weekly
 description: Count of users with single mode disabled
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_diff_multiple_files
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
index bbe90e2b809..6a0eff41bf2 100644
--- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_weekly.aggregated_metrics.code_review_group_monthly_active_users
 name: "0"
 description:
diff --git a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
index 98c66534ed9..88871232e78 100644
--- a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_weekly.aggregated_metrics.code_review_category_monthly_active_users
 name: "0"
 description:
diff --git a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
index cd837f9812a..5e6de879284 100644
--- a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts_weekly.aggregated_metrics.code_review_extension_category_monthly_active_users
 name: ""
 description:
diff --git a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
index 259bc4f4357..aceb92b7576 100644
--- a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_counts_weekly
 name: "0"
 description:
@@ -12,7 +12,12 @@ status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 7d
-data_source:
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - o_pipeline_authoring_unique_users_committing_ciconfigfile
+    - o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
index 7151effc438..75841e1a340 100644
--- a/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
+++ b/config/metrics/counts_7d/20210514013544_i_code_review_user_load_conflict_ui_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_load_conflict_ui_weekly
 name: load_conflict_ui
 description: Count of unique users per week who load the conflict resolution page
@@ -12,6 +12,10 @@ status: data_available
 milestone: "13.12"
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_load_conflict_ui
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61654
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
index 211c3bee0fc..485797cf199 100644
--- a/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
+++ b/config/metrics/counts_7d/20210514013545_i_code_review_user_resolve_conflict_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_resolve_conflict_weekly
 name: resolve_conflict
 description: Count of unique users per week who attempt to resolve a conflict through the ui
@@ -12,6 +12,10 @@ status: data_available
 milestone: "13.12"
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_resolve_conflict
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61654
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
index 020d10a7900..a41d9b758f0 100644
--- a/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_helm_deploy_token_weekly
 description: Distinct Helm pakages deployed in recent 7 days
 product_section: ops
@@ -12,6 +12,10 @@ milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61014
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_helm_deploy_token
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
index 7eeb3280389..aa1795925de 100644
--- a/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_helm_user_weekly
 description: Distinct user count events for Helm packages in recent 7 days
 product_section: ops
@@ -12,6 +12,10 @@ milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61014
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_helm_user
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml b/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
index d0b6ac4df67..a3cb9e2c400 100644
--- a/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
+++ b/config/metrics/counts_7d/20210607113552_i_code_review_click_diff_view_setting_weekly.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_click_diff_view_setting_weekly
 description: Count of users clicking diff view setting
 product_section: dev
@@ -12,6 +12,10 @@ milestone: '13.12'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_click_diff_view_setting
 distribution:
   - ce
 tier:
diff --git a/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml b/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
new file mode 100644
index 00000000000..ac63687acfb
--- /dev/null
+++ b/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_user_searches_diff_weekly
+description: Count of users who search merge request diffs
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '14.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66522
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_searches_diff
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml b/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
new file mode 100644
index 00000000000..911aec604b1
--- /dev/null
+++ b/config/metrics/counts_7d/20210721042223_i_quickactions_severity_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_severity_weekly
+description: Count of WAU using the `/severity` quick action
+product_section: ops
+product_stage: monitor
+product_group: group::monitor
+product_category: incident_management
+value_type: number
+status: implemented
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66422
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_severity
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210201124934_deployments.yml b/config/metrics/counts_all/20210201124934_deployments.yml
index c4be64fb54c..a25586f27e8 100644
--- a/config/metrics/counts_all/20210201124934_deployments.yml
+++ b/config/metrics/counts_all/20210201124934_deployments.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.deployments
 description: Total deployments count
 product_section: ops
 product_stage: release
-product_group: group::ops release
+product_group: group::release
 value_type: number
 status: data_available
 milestone: "8.12"
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml
index f17144ac78b..8012b83b251 100644
--- a/config/metrics/counts_all/20210204124930_servers.yml
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: gitaly.servers
 description: Total Gitalty Servers
 product_section: growth
diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml
index 2c59827cda0..c5be4a912a6 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: gitaly.clusters
 description: Total GitLab Managed clusters both enabled and disabled
 product_section: growth
diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index fd58874e988..03b58e61f70 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.cycle_analytics_views
 description: Total visits to VSA (both group- and project-level) all time
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: all
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
index 14c97a9b8b9..c31b0a9d912 100644
--- a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
+++ b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: analytics_unique_visits.p_analytics_pipelines
 description: Unique visitors to /:group/:project/pipelines/charts
 product_section: dev
diff --git a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
index 0995d26c9ed..8fb0041b290 100644
--- a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
+++ b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: analytics_unique_visits.p_analytics_valuestream
 description: Unique visitors to /:group/:project/-/value_stream_analytics
 product_section: dev
diff --git a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
index 4bed3379057..f70c95b4b35 100644
--- a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
+++ b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: analytics_unique_visits.p_analytics_repo
 description: Unique visitors to /:group/:project/-/graphs/master/charts
 product_section: dev
diff --git a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
index b0cb18358ca..7bd836eb477 100644
--- a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
+++ b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: analytics_unique_visits.i_analytics_cohorts
 description: Unique visitors to /-/instance_statistics/cohorts
 product_section: dev
diff --git a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml b/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
index a6dfe768e20..5d2413b9297 100644
--- a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
+++ b/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: analytics_unique_visits.i_analytics_dev_ops_score
 description: Unique visitors to /-/instance_statistics/dev_ops_score
 product_section: dev
diff --git a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
index 5fd57bdb019..3fdb40f32d9 100644
--- a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: analytics_unique_visits.g_analytics_merge_request
 description: Unique visitors to /groups/:group/-/analytics/merge_request_analytics
 product_section: dev
diff --git a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
index 6b92fa1aa1e..dc5d05da04a 100644
--- a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
+++ b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: analytics_unique_visits.i_analytics_instance_statistics
 description: Unique visitors to/admin/usage_trends
 product_section: dev
diff --git a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
index c2c41f00269..55197013071 100644
--- a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
+++ b/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
@@ -1,17 +1,18 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: analytics_unique_visits.analytics_unique_visits_for_any_target
 description: Unique visitors to any analytics feature by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: 
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
index 519149b839e..5f03db90f3b 100644
--- a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_prometheus_alerts
 description: Projects with Prometheus alerting enabled
 product_section: ops
@@ -16,3 +16,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
index 503eff4de83..74a39d81941 100644
--- a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
+++ b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.pod_logs_usages_total
 description: Count the total number of log views
 product_section: ops
@@ -16,3 +16,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
index 87a2a8517c5..8cd2a5bd761 100644
--- a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.service_desk_enabled_projects
 description: Count of service desk enabled projects
 product_section: dev
@@ -15,3 +15,4 @@ distribution:
 - ee
 tier:
 - free
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175026_service_desk_issues.yml b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
index 769d817c5df..9e2dc5499b0 100644
--- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.service_desk_issues
 description: Count of service desk issues
 product_section: dev
@@ -15,3 +15,4 @@ distribution:
 - ee
 tier:
 - free
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175037_suggestions.yml b/config/metrics/counts_all/20210216175037_suggestions.yml
index 34c62fbadc5..5cd566a3186 100644
--- a/config/metrics/counts_all/20210216175037_suggestions.yml
+++ b/config/metrics/counts_all/20210216175037_suggestions.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.suggestions
 description: Count of all comments that contain suggested changes
 product_section: dev
@@ -14,6 +14,7 @@ distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175039_merge_requests.yml b/config/metrics/counts_all/20210216175039_merge_requests.yml
index 3f4d9c4a09e..1c9a1a0185c 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.merge_requests
 description: Count of the number of merge requests
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175041_merge_request_comment.yml b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
index 7dd45570b1b..0b3bce59176 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.merge_request_comment
 description: Count of the number of merge request comments
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175043_merge_request_create.yml b/config/metrics/counts_all/20210216175043_merge_request_create.yml
index ca9d632f7fb..13393b8c1b8 100644
--- a/config/metrics/counts_all/20210216175043_merge_request_create.yml
+++ b/config/metrics/counts_all/20210216175043_merge_request_create.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.merge_request_create
 description: Count of the number of merge requests created
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175045_merge_requests.yml b/config/metrics/counts_all/20210216175045_merge_requests.yml
index 4fe94585cb5..088df8eca7c 100644
--- a/config/metrics/counts_all/20210216175045_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175045_merge_requests.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.create.merge_requests
 description: Count of the number of users creating merge requests
 product_section: dev
diff --git a/config/metrics/counts_all/20210216175053_suggestions.yml b/config/metrics/counts_all/20210216175053_suggestions.yml
index eecdbbce928..f0361655616 100644
--- a/config/metrics/counts_all/20210216175053_suggestions.yml
+++ b/config/metrics/counts_all/20210216175053_suggestions.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.create.suggestions
 description: Count of unique users who create suggestions in merge request comments
 product_section: dev
diff --git a/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml b/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml
index 051271c0ef7..b5facd08c21 100644
--- a/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml
+++ b/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.merged_merge_requests_using_approval_rules
 description: Count of merge requests merged using approval rules
 product_section: dev
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index 996ea2eb758..be8c33d144d 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.auto_devops_enabled
 description: Projects with Auto DevOps template enabled (excluding implicit Auto DevOps enabled and Auto DevOps template includes)
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
index ec14d9fb136..69e9729d825 100644
--- a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
+++ b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.auto_devops_disabled
 description: Projects with Auto DevOps template disabled
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: auto_devops
 value_type: number
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175232_clusters.yml b/config/metrics/counts_all/20210216175232_clusters.yml
index ad0ac652f38..e6894699827 100644
--- a/config/metrics/counts_all/20210216175232_clusters.yml
+++ b/config/metrics/counts_all/20210216175232_clusters.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters
 description: Total GitLab Managed clusters both enabled and disabled
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175234_clusters_enabled.yml b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
index ce24bd621f0..6b940dfb5b3 100644
--- a/config/metrics/counts_all/20210216175234_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_enabled
 description: Number of Kubernetes clusters attached to GitLab currently enabled
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
index 0ed0d6cf750..f0db7b473cf 100644
--- a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.project_clusters_enabled
 description: Total GitLab Managed clusters attached to projects
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
index 5012ead035b..6765d24cea8 100644
--- a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.group_clusters_enabled
 description: Total GitLab Managed clusters attached to groups
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
index f7bca6e41e3..afa8a761cf1 100644
--- a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instance_clusters_enabled
 description: Total GitLab Managed clusters attached to the instance
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175242_clusters_disabled.yml b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
index c565d98e49a..0fac20affd3 100644
--- a/config/metrics/counts_all/20210216175242_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_disabled
 description: Number of Kubernetes clusters attached to GitLab currently disabled
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
index 287bdca078b..2b41f610415 100644
--- a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.project_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to projects
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
index 68b61ff5b46..b7a839f345a 100644
--- a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.group_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to groups
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
index 073850f5463..94b5d48dffa 100644
--- a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instance_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to the instance
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
index 4fca68d6f71..1470dbe809f 100644
--- a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_platforms_eks
 description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
index 4d8427593a1..6f1692cc2b6 100644
--- a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_platforms_gke
 description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
index fe7c132d82f..eaeff4aa3a0 100644
--- a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_platforms_user
 description: Total GitLab Managed clusters that are user provisioned
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
index 1e3a96d3152..bb85d43bc63 100644
--- a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_applications_helm
 description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
index 0651d1f90a8..87b412b45f6 100644
--- a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_applications_ingress
 description: Total GitLab Managed clusters with GitLab Managed App:Ingress installed
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
index b86d5852c7b..f93f0e73e9d 100644
--- a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_applications_cert_managers
 description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager installed
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
index 1dea299b5ff..b365dabe466 100644
--- a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
+++ b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_applications_crossplane
 description: Total GitLab Managed clusters with GitLab Managed App:Crossplane installed
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
index 808540ba88f..7d86d5da125 100644
--- a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_applications_prometheus
 description: Total GitLab Managed clusters with GitLab Managed App:Prometheus installed
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
index 34e28262f76..d10f2bb240a 100644
--- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_applications_runner
 description: Total GitLab Managed clusters with GitLab Managed App:Runner installed
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
index 42b16eacd6e..a92b043622d 100644
--- a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_applications_knative
 description: Total GitLab Managed clusters with GitLab Managed App:Knative installed
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
index b1ef839ac43..9f94bf9ff30 100644
--- a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
+++ b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_applications_elastic_stack
 description: Total GitLab Managed clusters with GitLab Managed App:Elastic Stack installed
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
index 392d44e6553..8501a763454 100644
--- a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
+++ b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_applications_jupyter
 description: Total GitLab Managed clusters with GitLab Managed App:Jupyter installed
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
index 5cdc7474bf5..f0157783235 100644
--- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
+++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.clusters_applications_cilium
 description: Total GitLab Managed clusters with GitLab Managed App:Cilium installed
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175314_clusters_management_project.yml b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
index 6c0ea2d0c58..c6dbd9469c1 100644
--- a/config/metrics/counts_all/20210216175314_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.clusters_management_project
 description: Total GitLab Managed clusters with defined cluster management project
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
index 07322a58d15..9fc55da3b64 100644
--- a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.projects_with_terraform_reports
 description: Count of projects with Terraform MR reports
 product_section: ops
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
index be0275883a8..b7ea1a99a1f 100644
--- a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.projects_with_terraform_states
 description: Count of projects with GitLab Managed Terraform State
 product_section: ops
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175324_terraform_reports.yml b/config/metrics/counts_all/20210216175324_terraform_reports.yml
index 8f242395e68..7694a8fd2fd 100644
--- a/config/metrics/counts_all/20210216175324_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175324_terraform_reports.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.terraform_reports
 description: Count of Terraform MR reports generated
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175326_terraform_states.yml b/config/metrics/counts_all/20210216175326_terraform_states.yml
index 2bb13be07c5..0c1c27335cc 100644
--- a/config/metrics/counts_all/20210216175326_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175326_terraform_states.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.terraform_states
 description: Count of GitLab Managed Terraform States
 product_section: ops
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
index ce9a919460a..a9f0eb521d9 100644
--- a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.clusters_applications_cert_managers
 description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager installed
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
index 46301cbf2f3..44ff075ea0e 100644
--- a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.clusters_applications_helm
 description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
index 89eb556a996..9b92d67d09b 100644
--- a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.clusters_applications_ingress
 description: Total GitLab Managed clusters with GitLab Managed App:Ingress installed
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
index a7101c89a2c..5bd5d52f8ab 100644
--- a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.clusters_applications_knative
 description: Total GitLab Managed clusters with GitLab Managed App:Knative installed
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175337_clusters_management_project.yml b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
index d32374df6a8..f137981b7fd 100644
--- a/config/metrics/counts_all/20210216175337_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.clusters_management_project
 description: Total GitLab Managed clusters with defined cluster management project
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175339_clusters_disabled.yml b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
index 7547ea1c8ed..15becf3a739 100644
--- a/config/metrics/counts_all/20210216175339_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.clusters_disabled
 description: Total GitLab Managed disabled clusters
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175341_clusters_enabled.yml b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
index 77ffd392775..2a5d932ccf5 100644
--- a/config/metrics/counts_all/20210216175341_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.clusters_enabled
 description: Total GitLab Managed clusters currently enabled
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
index 833ca0494db..2847e56bbcf 100644
--- a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.clusters_platforms_gke
 description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
index c25be58930f..52af7411aae 100644
--- a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.clusters_platforms_eks
 description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
index cc0f4efad56..53ec5375937 100644
--- a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.clusters_platforms_user
 description: Total GitLab Managed clusters that are user provisioned
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
index d90a85a149d..27826144191 100644
--- a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.instance_clusters_disabled
 description: Total GitLab Managed disabled clusters attached to the instance
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
index e038d6980a3..4e26fef5e62 100644
--- a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.instance_clusters_enabled
 description: Total GitLab Managed enabled clusters attached to the instance
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
index 4aa9989d950..07651126a41 100644
--- a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.group_clusters_disabled
 description: Total GitLab Managed disabled clusters attached to groups
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
index d953b58a6e0..72182fde574 100644
--- a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.group_clusters_enabled
 description: Total GitLab Managed enabled clusters attached to groups
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
index 85334120c78..a8b21924a1b 100644
--- a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.project_clusters_disabled
 description: Total GitLab Managed disabled clusters attached to projects
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
index c94c1f8cbd8..80ac8ff67e3 100644
--- a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.project_clusters_enabled
 description: Total GitLab Managed enabled clusters attached to projects
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
index e09bf71d2cf..ab1a286bc0c 100644
--- a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.configure.projects_with_prometheus_alerts
 description: Projects with Prometheus alerting enabled
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
index c66cd726b7a..7e9b163f23a 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.ingress_modsecurity_packets_processed
 description: Cumulative count of packets processed by ModSecurity since Usage Ping
   was last reported
@@ -19,3 +19,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
index 1440f02342c..23c3beb2812 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.ingress_modsecurity_packets_anomalous
 description: Cumulative count of packets identified as anomalous by ModSecurity since
   Usage Ping was last reported
@@ -19,3 +19,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
index c6a96626c70..1b3448efecc 100644
--- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
+++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.network_policy_forwards
 description: Cumulative count of packets forwarded by Cilium (Container Network Security)
   since Usage Ping was last reported
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175448_network_policy_drops.yml b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
index d7a53aca969..54b947599a9 100644
--- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml
+++ b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.network_policy_drops
 description: Cumulative count of packets dropped by Cilium (Container Network Security)
   since Usage Ping was last reported
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
index c4dc9186523..8db0a0bd4d6 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.ingress_modsecurity_logging
 description: Whether or not ModSecurity is set to logging mode
 product_section: sec
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
index c2fc55031de..a663a49b88e 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.ingress_modsecurity_blocking
 description: Whether or not ModSecurity is set to blocking mode
 product_section: sec
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
index 2f1cb1aa55f..44bf44bd20a 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.ingress_modsecurity_disabled
 description: Whether or not ModSecurity is disabled within Ingress
 product_section: sec
diff --git a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
index 3331525f4b9..7de28e42533 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.ingress_modsecurity_not_installed
 description: Whether or not ModSecurity has not been installed into the cluster
 product_section: sec
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175510_ci_builds.yml b/config/metrics/counts_all/20210216175510_ci_builds.yml
index 692b7aaead6..74f9d3963a7 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.ci_builds
 description: Unique builds in project
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
index 333cdb695f3..85db2d7eed1 100644
--- a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.ci_internal_pipelines
 description: Total pipelines in GitLab repositories
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
index 25421f724d6..31f948b0eb7 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.ci_external_pipelines
 description: Total pipelines in external repositories
 product_section: ops
@@ -14,3 +14,4 @@ distribution:
 - ce
 tier:
 - free
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
index ccf24beccc0..e3a379ed21e 100644
--- a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.ci_pipeline_config_auto_devops
 description: Total pipelines from an Auto DevOps template
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
index d00e0f0777c..1c03e614c6e 100644
--- a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.ci_pipeline_config_repository
 description: Total Pipelines from templates in repository
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index d13a77aecc0..185783bf693 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.ci_runners
 description: Total configured Runners of all types
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175521_ci_triggers.yml b/config/metrics/counts_all/20210216175521_ci_triggers.yml
index 024f004389e..b6452ca45f2 100644
--- a/config/metrics/counts_all/20210216175521_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175521_ci_triggers.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.ci_triggers
 description: Total configured Triggers in project
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
index 923fc5426ef..f136cb35ac5 100644
--- a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.ci_pipeline_schedules
 description: Pipeline schedules in GitLab
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175525_ci_builds.yml b/config/metrics/counts_all/20210216175525_ci_builds.yml
index 08ca3cd8016..3b857e8bb0d 100644
--- a/config/metrics/counts_all/20210216175525_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175525_ci_builds.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.verify.ci_builds
 description: Unique count of builds in project
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
index 1ad849f6a28..827bcbcd2e2 100644
--- a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.verify.ci_external_pipelines
 description: Total pipelines in external repositories
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
index 85368582dd9..1e1a1ee7af3 100644
--- a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.verify.ci_internal_pipelines
 description: Total pipelines in GitLab repositories
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
index 381c16ff446..3b9790f9b71 100644
--- a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.verify.ci_pipeline_config_auto_devops
 description: Total pipelines from an Auto DevOps template
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
index 2e54d756869..6763d3f0f10 100644
--- a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.verify.ci_pipeline_config_repository
 description: Total Pipelines from templates in repository
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
index b1585df984e..3c882f1f759 100644
--- a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.verify.ci_pipeline_schedules
 description: Pipeline schedules in GitLab
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
index 1815adef5ba..f6fb62945f0 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.verify.ci_pipelines
 description: Distinct Users triggering Total pipelines
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175539_ci_triggers.yml b/config/metrics/counts_all/20210216175539_ci_triggers.yml
index 9ef3dfa56b4..5a0e630993c 100644
--- a/config/metrics/counts_all/20210216175539_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175539_ci_triggers.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.verify.ci_triggers
 description: Total configured Triggers in project
 product_section: ops
diff --git a/config/metrics/counts_all/20210216175612_dast_jobs.yml b/config/metrics/counts_all/20210216175612_dast_jobs.yml
deleted file mode 100644
index d0156f1f3c8..00000000000
--- a/config/metrics/counts_all/20210216175612_dast_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: counts.dast_jobs
-description: Count of DAST jobs run
-product_section: sec
-product_stage: secure
-product_group: group::dynamic analysis
-product_category: dynamic_application_security_testing
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175614_user_dast_jobs.yml b/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
deleted file mode 100644
index 2670cb4b8fe..00000000000
--- a/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: usage_activity_by_stage.secure.user_dast_jobs
-description: Count of DAST jobs
-product_section: sec
-product_stage: secure
-product_group: group::dynamic analysis
-product_category: dynamic_application_security_testing
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216175621_web_hooks.yml b/config/metrics/counts_all/20210216175621_web_hooks.yml
index b829a859290..9c7f000ae50 100644
--- a/config/metrics/counts_all/20210216175621_web_hooks.yml
+++ b/config/metrics/counts_all/20210216175621_web_hooks.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.web_hooks
-description:
+description: 
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
-product_category:
+product_stage: ecosystem
+product_group: group::integrations
+product_category: 
 value_type: number
 status: data_available
 time_frame: all
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175623_projects_asana_active.yml b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
index 75b17cf2694..67b7ef98471 100644
--- a/config/metrics/counts_all/20210216175623_projects_asana_active.yml
+++ b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_asana_active
 description: Count of projects with active integrations for Asana
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175625_groups_asana_active.yml b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
index 04a4c42ac42..2fa25aa0bc1 100644
--- a/config/metrics/counts_all/20210216175625_groups_asana_active.yml
+++ b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_asana_active
 description: Count of groups with active integrations for Asana
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175627_templates_asana_active.yml b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
index 280bd2a65ce..e0348f0760b 100644
--- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml
+++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_asana_active
 description: Count of active service templates for Asana
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175628_instances_asana_active.yml b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
index ddc4ebd81e0..daad2b4f7ad 100644
--- a/config/metrics/counts_all/20210216175628_instances_asana_active.yml
+++ b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_asana_active
 description: Count of active instance-level integrations for Asana
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
index 7c81aece025..adfe86ba5e0 100644
--- a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_asana_active
 description: Count of active projects inheriting integrations for Asana
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
index 059d530bf9a..c08e3762d53 100644
--- a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_asana_active
 description: Count of active groups inheriting integrations for Asana
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
index d4a18e98a79..892b7723ba0 100644
--- a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_assembla_active
 description: Count of projects with active integrations for Assembla
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
index fbca5a637b4..7a0a02c3f34 100644
--- a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_assembla_active
 description: Count of groups with active integrations for Assembla
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
index d8c37f77664..c0867387261 100644
--- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_assembla_active
 description: Count of active service templates for Assembla
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
index d1af8c2820f..9ae2d48a683 100644
--- a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_assembla_active
 description: Count of active instance-level integrations for Assembla
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
index 1e8ce793e0a..ec1402be55d 100644
--- a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_assembla_active
 description: Count of active projects inheriting integrations for Assembla
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
index 91654462c1a..eed75f72abd 100644
--- a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_assembla_active
 description: Count of active groups inheriting integrations for Assembla
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
index cc9f74c7415..0d7f1b4b22f 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.projects_bamboo_active
 description: Count of projects with active integrations for Bamboo CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
index 12cdc11d195..e6379a4bfed 100644
--- a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_bamboo_active
 description: Count of groups with active integrations for Bamboo CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
index da8243e1dd6..e3c0882e781 100644
--- a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_bamboo_active
 description: Count of active service templates for Bamboo CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
index 3e5bc70a99e..61af43bb5e4 100644
--- a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_bamboo_active
 description: Count of active instance-level integrations for Bamboo CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
index 50546cbf76b..5670c7dd7b1 100644
--- a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_bamboo_active
 description: Count of active projects inheriting integrations for Bamboo CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
index 32635663d68..e71b6d1d89e 100644
--- a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_bamboo_active
 description: Count of active groups inheriting integrations for Bamboo CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
index a8541fc21f0..16af8eb9792 100644
--- a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_bugzilla_active
 description: Count of projects with active integrations for Bugzilla
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
index 3816cc2a245..fe14026cd09 100644
--- a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_bugzilla_active
 description: Count of groups with active integrations for Bugzilla
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
index 5bdf964f80c..99426d2a418 100644
--- a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_bugzilla_active
 description: Count of active service templates for Bugzilla
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
index ec008d0f91c..f727c33a009 100644
--- a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_bugzilla_active
 description: Count of active instance-level integrations for Bugzilla
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
index 63bc30268f3..375680322fc 100644
--- a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_bugzilla_active
 description: Count of active projects inheriting integrations for Bugzilla
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
index 1521204b5dc..58a5665b089 100644
--- a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_bugzilla_active
 description: Count of active groups inheriting integrations for Bugzilla
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
index 40f061c242d..36ccdfc3bb4 100644
--- a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_buildkite_active
 description: Count of projects with active integrations for Buildkite
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
index c82114a75db..eef27850d5e 100644
--- a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_buildkite_active
 description: Count of groups with active integrations for Buildkite
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
index 9270e03557d..70b1f66c6f2 100644
--- a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_buildkite_active
 description: Count of active service templates for Buildkite
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
index e503d9042b6..ce52864f710 100644
--- a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_buildkite_active
 description: Count of active instance-level integrations for Buildkite
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
index 85e23182bf2..409ea6b9d5d 100644
--- a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_buildkite_active
 description: Count of active projects inheriting integrations for Buildkite
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
index 327747aa559..6dd3e52aa89 100644
--- a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_buildkite_active
 description: Count of active groups inheriting integrations for Buildkite
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
index f8e938349f9..068b6ca70bd 100644
--- a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_campfire_active
 description: Count of projects with active integrations for Campfire
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
index fb55d4d3d55..81b57aaa2b7 100644
--- a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_campfire_active
 description: Count of groups with active integrations for Campfire
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
index 4bbaf6e6554..489e1ff085d 100644
--- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_campfire_active
 description: Count of active service templates for Campfire
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
index c6771e61376..ce01b949a43 100644
--- a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_campfire_active
 description: Count of active instance-level integrations for Campfire
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
index 778c0de4dc4..2de7329aace 100644
--- a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_campfire_active
 description: Count of active projects inheriting integrations for Campfire
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
index df30cd7ec1f..4639d011005 100644
--- a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_campfire_active
 description: Count of active groups inheriting integrations for Campfire
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
index 0a4e7d99d88..29420ee10e7 100644
--- a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_confluence_active
 description: Count of projects with active integrations for Confluence
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
index 87d0c93843e..5ee10fc89bd 100644
--- a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_confluence_active
 description: Count of groups with active integrations for Confluence
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
index 8f94952cc10..4e8db8fe031 100644
--- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_confluence_active
 description: Count of active service templates for Confluence
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
index f2628ced407..eda4940cc6d 100644
--- a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_confluence_active
 description: Count of active instance-level integrations for Confluence
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
index a70966d46a0..925341c3c81 100644
--- a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_confluence_active
 description: Count of active projects inheriting integrations for Confluence
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
index 95c6a39294b..d91c8dcd08d 100644
--- a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_confluence_active
 description: Count of active groups inheriting integrations for Confluence
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
index fbb968ad54d..f1d02dcdb9c 100644
--- a/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_custom_issue_tracker_active
 description: Count of projects with active integrations for a Custom Issue Tracker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
index 8345051c503..db1c0107686 100644
--- a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_custom_issue_tracker_active
 description: Count of groups with active integrations for a Custom Issue Tracker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
index f9ef9d86fd4..8a60d0a3c5f 100644
--- a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_custom_issue_tracker_active
 description: Count of active service templates for a Custom Issue Tracker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
index dfc66da3950..3f2658ffbde 100644
--- a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_custom_issue_tracker_active
 description: Count of active instance-level integrations for a Custom Issue Tracker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
index 4df6406a9e2..cad81761f76 100644
--- a/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_custom_issue_tracker_active
 description: Count of active projects inheriting integrations for a Custom Issue Tracker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
index d87dc02e454..20b3fbe3ba0 100644
--- a/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_custom_issue_tracker_active
 description: Count of active groups inheriting integrations for a Custom Issue Tracker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175753_projects_discord_active.yml b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
index 8b122d78760..e0973b0bffc 100644
--- a/config/metrics/counts_all/20210216175753_projects_discord_active.yml
+++ b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_discord_active
 description: Count of projects with active integrations for Discord
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175755_groups_discord_active.yml b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
index f00f412dd4e..f3fd18b3582 100644
--- a/config/metrics/counts_all/20210216175755_groups_discord_active.yml
+++ b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_discord_active
 description: Count of groups with active integrations for Discord
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175756_templates_discord_active.yml b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
index 116bd46a26c..0e16a045af2 100644
--- a/config/metrics/counts_all/20210216175756_templates_discord_active.yml
+++ b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_discord_active
 description: Count of active service templates for Discord
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175758_instances_discord_active.yml b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
index 4220913f486..12d230f4169 100644
--- a/config/metrics/counts_all/20210216175758_instances_discord_active.yml
+++ b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_discord_active
 description: Count of active instance-level integrations for Discord
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
index 7f7adba910a..2dd434f3642 100644
--- a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_discord_active
 description: Count of active projects inheriting integrations for Discord
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
index 3a30d9edc81..16f962bd7bf 100644
--- a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_discord_active
 description: Count of active groups inheriting integrations for Discord
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
index 73c20fe6c7f..c0de6ead30e 100644
--- a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.projects_drone_ci_active
 description: Count of projects with active integrations for Drone CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
index d663e7cce1d..c2824b4c179 100644
--- a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_drone_ci_active
 description: Count of groups with active integrations for Drone CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
index deec873fe42..8ee28df4d74 100644
--- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_drone_ci_active
 description: Count of active service templates for Drone CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
index 7e0b4cdf5c3..de5f27210ae 100644
--- a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_drone_ci_active
 description: Count of active instance-level integrations for Drone CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
index 9e180a77a1a..4d9e656fb28 100644
--- a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_drone_ci_active
 description: Count of active projects inheriting integrations for Drone CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
index 2a988b3f3bd..cb8883accf3 100644
--- a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_drone_ci_active
 description: Count of active groups inheriting integrations for Drone CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml b/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
index 8b45d688c7e..01a94735afc 100644
--- a/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_emails_on_push_active
 description: Count of projects with active integrations for Emails on Push
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml b/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
index 395cdca2097..67aa24bf260 100644
--- a/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_emails_on_push_active
 description: Count of groups with active integrations for Emails on Push
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
index 0b8ded80750..a73d3bf2eca 100644
--- a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_emails_on_push_active
 description: Count of active service templates for Emails on Push
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml b/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
index bbd1e8352a8..3b2d47f996f 100644
--- a/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_emails_on_push_active
 description: Count of active instance-level integrations for Emails on Push
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
index a7c697c42bc..fba967b7637 100644
--- a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_emails_on_push_active
 description: Count of active projects inheriting integrations for Emails on Push
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
index 921c3b93f63..4770cec8031 100644
--- a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_emails_on_push_active
 description: Count of active groups inheriting integrations for Emails on Push
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
index 5a0eacc0c14..2d59b821034 100644
--- a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_external_wiki_active
 description: Count of projects with active integrations for External Wiki
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
index 230ed723a54..9bf2573d8cf 100644
--- a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_external_wiki_active
 description: Count of groups with active integrations for External Wiki
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
index 8c20f6fa5c6..6eec57b84da 100644
--- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_external_wiki_active
 description: Count of active service templates for External Wiki
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
index 621535489a9..e69007baa07 100644
--- a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_external_wiki_active
 description: Count of active instance-level integrations for External Wiki
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
index 86a1a766671..7926a9e8afd 100644
--- a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_external_wiki_active
 description: Count of active projects inheriting integrations for External Wiki
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
index 06105bbd524..5afd44dd6c9 100644
--- a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_external_wiki_active
 description: Count of active groups inheriting integrations for External Wiki
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
index ea0a59427bc..b291a420ee0 100644
--- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_flowdock_active
 description: Count of projects with active integrations for Flowdock
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
index 17796bfe960..372d6d70b99 100644
--- a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_flowdock_active
 description: Count of groups with active integrations for Flowdock
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
index 5934b7ac573..8fdd17db523 100644
--- a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_flowdock_active
 description: Count of active service templates for Flowdock
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
index 816c14b8c9d..0ee29e5eafc 100644
--- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_flowdock_active
 description: Count of active instance-level integrations for Flowdock
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
index c7d1e8b2c8e..f235a68138a 100644
--- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_flowdock_active
 description: Count of active projects inheriting integrations for Flowdock
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
index c0ba0088c16..613f77a7823 100644
--- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_flowdock_active
 description: Count of active groups inheriting integrations for Flowdock
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
index 86dfd299126..b65bdf26462 100644
--- a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_hangouts_chat_active
 description: Count of projects with active integrations for Hangouts Chat
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
index 24e3c0fc0ef..f66a5390585 100644
--- a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_hangouts_chat_active
 description: Count of groups with active integrations for Hangouts Chat
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
index 70da2527614..0660b43acdb 100644
--- a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_hangouts_chat_active
 description: Count of active service templates for Hangouts Chat
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
index b89f32c3c95..760b2ae0130 100644
--- a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_hangouts_chat_active
 description: Count of active instance-level integrations for Hangouts Chat
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
index a2fc27b6fbd..b012752e100 100644
--- a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_hangouts_chat_active
 description: Count of active projects inheriting integrations for Hangouts Chat
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
index e46c6482dea..314f03f9c44 100644
--- a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_hangouts_chat_active
 description: Count of active groups inheriting integrations for Hangouts Chat
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
index 799521be83c..04bf41281d1 100644
--- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_hipchat_active
 description: Count of projects with active integrations for HipChat
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
index c354a3ad03d..6d1b376d473 100644
--- a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_hipchat_active
 description: Count of groups with active integrations for HipChat
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
index 18612ed28ea..1ad29856e8b 100644
--- a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_hipchat_active
 description: Count of active service templates for HipChat
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
index 225c0ce8493..17b27862eb8 100644
--- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_hipchat_active
 description: Count of active instance-level integrations for HipChat
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
index e87f2c43338..3926629d84e 100644
--- a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_hipchat_active
 description: Count of active projects inheriting integrations for HipChat
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
index 9092c8d7643..db64df5e880 100644
--- a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_hipchat_active
 description: Count of active groups inheriting integrations for HipChat
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175921_projects_irker_active.yml b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
index f3f1a2e0c60..6aa1dce7279 100644
--- a/config/metrics/counts_all/20210216175921_projects_irker_active.yml
+++ b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_irker_active
 description: Count of projects with active integrations for Irker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175923_groups_irker_active.yml b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
index f4ce06c3f46..23dee4faa99 100644
--- a/config/metrics/counts_all/20210216175923_groups_irker_active.yml
+++ b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_irker_active
 description: Count of groups with active integrations for Irker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175924_templates_irker_active.yml b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
index f8e0543e255..eff644775cc 100644
--- a/config/metrics/counts_all/20210216175924_templates_irker_active.yml
+++ b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_irker_active
 description: Count of active service templates for Irker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175926_instances_irker_active.yml b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
index 0a47027beac..ce785139cdb 100644
--- a/config/metrics/counts_all/20210216175926_instances_irker_active.yml
+++ b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_irker_active
 description: Count of active instance-level integrations for Irker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
index 5c7436821f4..84f11bfbbfb 100644
--- a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_irker_active
 description: Count of active projects inheriting integrations for Irker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
index 5ea531dec90..bb7fe5bd2bd 100644
--- a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_irker_active
 description: Count of active groups inheriting integrations for Irker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
index b294ccfec1b..52c1332cf9a 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.projects_jenkins_active
 description: Count of projects with active integrations for Jenkins
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
index 2c5223c9d32..04045aaa428 100644
--- a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_jenkins_active
 description: Count of groups with active integrations for Jenkins
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
index 6817fc10cdb..1cf5485d7a4 100644
--- a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_jenkins_active
 description: Count of active service templates for Jenkins
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
index dd8c64e551a..2c54388e9f4 100644
--- a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_jenkins_active
 description: Count of active instance-level integrations for Jenkins
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
index 855a66e0683..b5eed44d695 100644
--- a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_jenkins_active
 description: Count of active projects inheriting integrations for Jenkins
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
index d3fff6d2081..ba255d1b3a9 100644
--- a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_jenkins_active
 description: Count of active groups inheriting integrations for Jenkins
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
index 77437903f5b..fa63e02db35 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.projects_jira_active
 description: Count of projects with active integrations for Jira
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175945_groups_jira_active.yml b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
index 3b6dbb13cda..49cc71aeb61 100644
--- a/config/metrics/counts_all/20210216175945_groups_jira_active.yml
+++ b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_jira_active
 description: Count of groups with active integrations for Jira
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175946_templates_jira_active.yml b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
index 1f594a22f20..d643ad44387 100644
--- a/config/metrics/counts_all/20210216175946_templates_jira_active.yml
+++ b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_jira_active
 description: Count of active service templates for Jira
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175948_instances_jira_active.yml b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
index dfe5242dd35..4b251b68640 100644
--- a/config/metrics/counts_all/20210216175948_instances_jira_active.yml
+++ b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_jira_active
 description: Count of active instance-level integrations for Jira
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
index d1fc604e1de..1b11fa56c6f 100644
--- a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_jira_active
 description: Count of active projects inheriting integrations for Jira
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
index e94b051cb8f..68e82a030c8 100644
--- a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_jira_active
 description: Count of active groups inheriting integrations for Jira
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
index 45c54c82b60..f8c7edb9f40 100644
--- a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_mattermost_active
 description: Count of projects with active integrations for Mattermost
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
index 21672075af2..92c072c2c85 100644
--- a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_mattermost_active
 description: Count of groups with active integrations for Mattermost
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
index 56dbdde346d..d935e0a86b0 100644
--- a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_mattermost_active
 description: Count of active service templates for Mattermost
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
index f52e3d338a7..f7fe5081472 100644
--- a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_mattermost_active
 description: Count of active instance-level integrations for Mattermost
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
index e465b4cbef4..34b74f6ab28 100644
--- a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_mattermost_active
 description: Count of active projects inheriting integrations for Mattermost
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
index 06de0396903..68576193e3a 100644
--- a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_mattermost_active
 description: Count of active groups inheriting integrations for Mattermost
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
index 9a85ae8312c..d95571b0fb8 100644
--- a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_mattermost_slash_commands_active
 description: Count of projects with active integrations for Mattermost (slash commands)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
index 6f4f6650546..6ce8be4a8be 100644
--- a/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_mattermost_slash_commands_active
 description: Count of groups with active integrations for Mattermost (slash commands)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
index 43a5f626869..d9255db7311 100644
--- a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_mattermost_slash_commands_active
 description: Count of active service templates for Mattermost (slash commands)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
index 53aa6d27527..ad5e011a21c 100644
--- a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_mattermost_slash_commands_active
 description: Count of active instance-level integrations for Mattermost (slash commands)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
index 891fac7c787..4a26a69ed37 100644
--- a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_mattermost_slash_commands_active
 description: Count of active projects inheriting integrations for Mattermost (slash
   commands)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
index c8c36866d44..4c2deca981c 100644
--- a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_mattermost_slash_commands_active
 description: Count of active groups inheriting integrations for Mattermost (slash
   commands)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
index 560b42cde77..ff25e7fe72a 100644
--- a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_microsoft_teams_active
 description: Count of projects with active integrations for Microsoft Teams
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
index dc7371d1745..2afa40977b1 100644
--- a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_microsoft_teams_active
 description: Count of groups with active integrations for Microsoft Teams
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
index 370419aff59..4ac134394fc 100644
--- a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_microsoft_teams_active
 description: Count of active service templates for Microsoft Teams
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
index 610d09a68b5..e78ae2b7411 100644
--- a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_microsoft_teams_active
 description: Count of active instance-level integrations for Microsoft Teams
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
index a2c085f30e5..73791545ea6 100644
--- a/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_microsoft_teams_active
 description: Count of active projects inheriting integrations for Microsoft Teams
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
index be22c7830f3..a1300f264f6 100644
--- a/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_microsoft_teams_active
 description: Count of active groups inheriting integrations for Microsoft Teams
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
index ec5ac451d71..a009cb2045e 100644
--- a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_packagist_active
 description: Count of projects with active integrations for Packagist
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
index 0d75f771ea0..efcd3dbd39c 100644
--- a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_packagist_active
 description: Count of groups with active integrations for Packagist
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
index 61d9f15add0..f6a337662b8 100644
--- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_packagist_active
 description: Count of active service templates for Packagist
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
index ae4f5f06814..41693d7a984 100644
--- a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_packagist_active
 description: Count of active instance-level integrations for Packagist
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
index 08d464c2213..08073ec5aa9 100644
--- a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_packagist_active
 description: Count of active projects inheriting integrations for Packagist
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
index 569a7eb8306..e431c52ad43 100644
--- a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_packagist_active
 description: Count of active groups inheriting integrations for Packagist
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
index 3b45c9f9947..83f9c5b7342 100644
--- a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_pipelines_email_active
 description: Count of projects with active integrations for Pipeline Emails
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
index fddcd9a9146..a705d1e2da6 100644
--- a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_pipelines_email_active
 description: Count of groups with active integrations for Pipeline Emails
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
index 701d75a9684..df1bf53c012 100644
--- a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_pipelines_email_active
 description: Count of active service templates for Pipeline Emails
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
index 178baadc070..a759da8865a 100644
--- a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_pipelines_email_active
 description: Count of active instance-level integrations for Pipeline Emails
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
index cd7e583c50e..7f336697716 100644
--- a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_pipelines_email_active
 description: Count of active projects inheriting integrations for Pipeline Emails
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
index cce5ac08de0..049343d22f6 100644
--- a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_pipelines_email_active
 description: Count of active groups inheriting integrations for Pipeline Emails
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
index 99326cea857..5330268e079 100644
--- a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_pivotaltracker_active
 description: Count of projects with active integrations for Pivotal Tracker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
index 7045d5e34b3..3d077219657 100644
--- a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_pivotaltracker_active
 description: Count of groups with active integrations for Pivotal Tracker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
index 7be62a78316..183417d566c 100644
--- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_pivotaltracker_active
 description: Count of active service templates for Pivotal Tracker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
index 1c5a93d709a..adeec68290a 100644
--- a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_pivotaltracker_active
 description: Count of active instance-level integrations for Pivotal Tracker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
index 472d2aa43fb..c9f6ba7680a 100644
--- a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_pivotaltracker_active
 description: Count of active projects inheriting integrations for Pivotal Tracker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
index 184aea3687d..b247a3b48e4 100644
--- a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_pivotaltracker_active
 description: Count of active groups inheriting integrations for Pivotal Tracker
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
index d3185fc46ac..1f5635f56da 100644
--- a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_pushover_active
 description: Count of projects with active integrations for Pushover
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
index c44a4d69fe9..5a8225f97a3 100644
--- a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_pushover_active
 description: Count of groups with active integrations for Pushover
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
index a3e72973cc5..79ea70fc7fa 100644
--- a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_pushover_active
 description: Count of active service templates for Pushover
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
index b327d19929a..cfe8f5170d1 100644
--- a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_pushover_active
 description: Count of active instance-level integrations for Pushover
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
index 7326ed1cc0b..25942eb52ec 100644
--- a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_pushover_active
 description: Count of active projects inheriting integrations for Pushover
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
index bb235f34c2a..941fe56037a 100644
--- a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_pushover_active
 description: Count of active groups inheriting integrations for Pushover
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
index 9fdafd52921..b19251acb79 100644
--- a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_redmine_active
 description: Count of projects with active integrations for Redmine
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
index 2fa05ce7c92..5bb559e9f24 100644
--- a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_redmine_active
 description: Count of groups with active integrations for Redmine
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
index 87819195ab2..3a173346fa8 100644
--- a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_redmine_active
 description: Count of active service templates for Redmine
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
index 45a9c7e6544..17974b6f157 100644
--- a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_redmine_active
 description: Count of active instance-level integrations for Redmine
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
index 8b2dff7e6b7..8c94c811d69 100644
--- a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_redmine_active
 description: Count of active projects inheriting integrations for Redmine
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
index 79afa2e049f..459b97667eb 100644
--- a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_redmine_active
 description: Count of active groups inheriting integrations for Redmine
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180122_projects_slack_active.yml b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
index 5e7a9c2a947..4663d4b516c 100644
--- a/config/metrics/counts_all/20210216180122_projects_slack_active.yml
+++ b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_slack_active
 description: Count of projects with active integrations for Slack
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180124_groups_slack_active.yml b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
index c37e9f9140a..14c7bab4c77 100644
--- a/config/metrics/counts_all/20210216180124_groups_slack_active.yml
+++ b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_slack_active
 description: Count of groups with active integrations for Slack
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180126_templates_slack_active.yml b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
index 29d0395f65f..22a205d7d4c 100644
--- a/config/metrics/counts_all/20210216180126_templates_slack_active.yml
+++ b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_slack_active
 description: Count of active service templates for Slack
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180127_instances_slack_active.yml b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
index cc5b7bf37cf..8c9155ce5ab 100644
--- a/config/metrics/counts_all/20210216180127_instances_slack_active.yml
+++ b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_slack_active
 description: Count of active instance-level integrations for Slack
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
index 3a74804a708..0b3dae20a6e 100644
--- a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_slack_active
 description: Count of active projects inheriting integrations for Slack
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
index 2c3b609c62c..93ca97e00e5 100644
--- a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_slack_active
 description: Count of active groups inheriting integrations for Slack
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
index 123e54a476e..d98029d89ad 100644
--- a/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_slack_slash_commands_active
 description: Count of projects with active integrations for Slack (slash commands)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
index 6d89c7b9989..f1434b65fbf 100644
--- a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_slack_slash_commands_active
 description: Count of groups with active integrations for Slack (slash commands)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
index af55e772789..48edd9813ef 100644
--- a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_slack_slash_commands_active
 description: Count of active service templates for Slack (slash commands)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
index a8f1e42d1f6..7cd8c1de0be 100644
--- a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_slack_slash_commands_active
 description: Count of active instance-level integrations for Slack (slash commands)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
index c1abf8a275d..c28b0116702 100644
--- a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_slack_slash_commands_active
 description: Count of active projects inheriting integrations for Slack (slash commands)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
index 27ed427d86f..e94e5d173bd 100644
--- a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_slack_slash_commands_active
 description: Count of active groups inheriting integrations for Slack (slash commands)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
index 9447e14440b..4c6c5c6c519 100644
--- a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_teamcity_active
 description: Count of projects with active integrations for Teamcity CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
index 70b294116bf..20a719dbefb 100644
--- a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_teamcity_active
 description: Count of groups with active integrations for Teamcity CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
index ab4d34d5f61..5e8ea66b008 100644
--- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_teamcity_active
 description: Count of active service templates for Teamcity CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
index cd481476f0d..f02df75cc87 100644
--- a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_teamcity_active
 description: Count of active instance-level integrations for Teamcity CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
index 74deb0be573..54121809d98 100644
--- a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_teamcity_active
 description: Count of active projects inheriting integrations for Teamcity CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
index 9a5cc4b349a..33a126b4d0c 100644
--- a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_teamcity_active
 description: Count of active groups inheriting integrations for Teamcity CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
index a82810eabb5..be5ddb60891 100644
--- a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_unify_circuit_active
 description: Count of projects with active integrations for Unifiy Circuit
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
index e8a59d383ca..ca03f75a395 100644
--- a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_unify_circuit_active
 description: Count of groups with active integrations for Unifiy Circuit
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
index cc897bec2b7..77d402bdd52 100644
--- a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_unify_circuit_active
 description: Count of active service templates for Unifiy Circuit
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
index dc4102b2ef9..7e789cdb67f 100644
--- a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_unify_circuit_active
 description: Count of active instance-level integrations for Unifiy Circuit
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
index 46940eb87ba..4b5e83b2fea 100644
--- a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_unify_circuit_active
 description: Count of active projects inheriting integrations for Unifiy Circuit
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
index 399cbb4118d..55644e584d6 100644
--- a/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_unify_circuit_active
 description: Count of active groups inheriting integrations for Unifiy Circuit
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
index 2da0d946e6b..d6284cb68fd 100644
--- a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_webex_teams_active
 description: Count of projects with active integrations for Webex Teams
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
index 4377a6a8ae9..7ef4fe1ca41 100644
--- a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_webex_teams_active
 description: Count of groups with active integrations for Webex Teams
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
index 5b4bbfd087d..e461f99e596 100644
--- a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_webex_teams_active
 description: Count of active service templates for Webex Teams
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
index 89cedc88728..c82e1a34b19 100644
--- a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_webex_teams_active
 description: Count of active instance-level integrations for Webex Teams
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
index 5f6fc503ee5..e16b7177fb3 100644
--- a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_webex_teams_active
 description: Count of active projects inheriting integrations for Webex Teams
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
index 0f941e2bae1..31737003f39 100644
--- a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_webex_teams_active
 description: Count of active groups inheriting integrations for Webex Teams
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
index 4e41172f899..9361edb0a12 100644
--- a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_youtrack_active
 description: Count of projects with active integrations for YouTrack
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
index e7898df41b6..a2fa39722b3 100644
--- a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_youtrack_active
 description: Count of groups with active integrations for YouTrack
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
index 5c9e2b5035a..bd32fd5eb6e 100644
--- a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_youtrack_active
 description: Count of active service templates for YouTrack
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
index 539dfa823e2..cb160d513b0 100644
--- a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_youtrack_active
 description: Count of active instance-level integrations for YouTrack
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
index ffe45fa9067..875620ff2ba 100644
--- a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_youtrack_active
 description: Count of active projects inheriting integrations for YouTrack
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
index 0a9419cda7c..34f0c8f93fa 100644
--- a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_youtrack_active
 description: Count of active groups inheriting integrations for YouTrack
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
index 5cee8c3bf73..8870013fc2b 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.projects_jira_server_active
 description: Count of active integrations with Jira Software (server)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
index b0c17d0593a..adf7098e71c 100644
--- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.projects_jira_cloud_active
 description: Count of active integrations with Jira Cloud (Saas)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
index 0e25660ce50..33be7ef4f87 100644
--- a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.projects_jira_dvcs_cloud_active
 description: Count of active integrations with Jira Cloud (DVCS Connector)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
index 41c2de3e50d..b7fa31e101e 100644
--- a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.projects_jira_dvcs_server_active
 description: Count of active integrations with Jira Software (DVCS connector)
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180239_personal_snippets.yml b/config/metrics/counts_all/20210216180239_personal_snippets.yml
index e92774f3ef1..ea8404a6163 100644
--- a/config/metrics/counts_all/20210216180239_personal_snippets.yml
+++ b/config/metrics/counts_all/20210216180239_personal_snippets.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.personal_snippets
 description: Count of personal Snippets
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180241_project_snippets.yml b/config/metrics/counts_all/20210216180241_project_snippets.yml
index 913c5be4317..1f915327d39 100644
--- a/config/metrics/counts_all/20210216180241_project_snippets.yml
+++ b/config/metrics/counts_all/20210216180241_project_snippets.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.project_snippets
 description: Count of project Snippets
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180242_web_ide_commits.yml b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
index 72df60b6cd1..c85dd1f876c 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.web_ide_commits
 description: Count of commits made from the Web IDE
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180244_web_ide_views.yml b/config/metrics/counts_all/20210216180244_web_ide_views.yml
index 203601234f7..222e92482e9 100644
--- a/config/metrics/counts_all/20210216180244_web_ide_views.yml
+++ b/config/metrics/counts_all/20210216180244_web_ide_views.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.web_ide_views
 description: Count of views of the Web IDE
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
index 9b9593776cb..c5e50275878 100644
--- a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.web_ide_merge_requests
 description: Count of merge requests created from the Web IDE
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180248_web_ide_previews.yml b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
index a7230288a3d..b4c349e5cc3 100644
--- a/config/metrics/counts_all/20210216180248_web_ide_previews.yml
+++ b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.web_ide_previews
 description: Count of Live Preview tab views in the Web IDE
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
index 9547d6be9ec..d451222dfd4 100644
--- a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
+++ b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.web_ide_terminals
 description: Count of Web Terminal tab views in the Web IDE
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
index 0b5738cf4f6..562f6381487 100644
--- a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
+++ b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.web_ide_pipelines
 description: Count of Pipeline tab views in the Web IDE
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180253_snippet_comment.yml b/config/metrics/counts_all/20210216180253_snippet_comment.yml
index d3e954f8803..efc079fa13e 100644
--- a/config/metrics/counts_all/20210216180253_snippet_comment.yml
+++ b/config/metrics/counts_all/20210216180253_snippet_comment.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.snippet_comment
 description: Count of comments on Snippets
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180255_snippet_create.yml b/config/metrics/counts_all/20210216180255_snippet_create.yml
index 1402963f70d..4303deb1aeb 100644
--- a/config/metrics/counts_all/20210216180255_snippet_create.yml
+++ b/config/metrics/counts_all/20210216180255_snippet_create.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.snippet_create
 description: Count of newly created Snippets
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180257_snippet_update.yml b/config/metrics/counts_all/20210216180257_snippet_update.yml
index b766ae4194f..d59f2a63a42 100644
--- a/config/metrics/counts_all/20210216180257_snippet_update.yml
+++ b/config/metrics/counts_all/20210216180257_snippet_update.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.snippet_update
 description: Count of updates to existing Snippets
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
index d69379885cd..684bf25af10 100644
--- a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
+++ b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.static_site_editor_views
 description: Count of Static Site Editor views
 product_section: dev
@@ -17,3 +17,6 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type:
+- gmau
+- paid_gmau
diff --git a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
index cc16b87efa4..046448d551a 100644
--- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
+++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.static_site_editor_commits
 description: Count of commits created from the Static Site Editor
 product_section: dev
diff --git a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
index 5c3a0b2ae6e..62741924580 100644
--- a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.static_site_editor_merge_requests
 description: Count of merge requests created via Static Site Editor
 product_section: dev
diff --git a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
index 4453f13dc09..ed85c6ba21d 100644
--- a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
+++ b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.user_preferences_user_gitpod_enabled
 description: Count of users with the GitPod integration enabled
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180306_snippets.yml b/config/metrics/counts_all/20210216180306_snippets.yml
index bbefefbdf01..5dcf43846e6 100644
--- a/config/metrics/counts_all/20210216180306_snippets.yml
+++ b/config/metrics/counts_all/20210216180306_snippets.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.snippets
 description: Count of all Snippets
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180316_snippets.yml b/config/metrics/counts_all/20210216180316_snippets.yml
index cec9bd481db..f975500f3e6 100644
--- a/config/metrics/counts_all/20210216180316_snippets.yml
+++ b/config/metrics/counts_all/20210216180316_snippets.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.create.snippets
 name: count_distinct_author_id_from_snippets
 description: Count of distinct author_id from snippets
diff --git a/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml b/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
deleted file mode 100644
index c2e93cfd5cf..00000000000
--- a/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Optional
-key_path: counts.api_fuzzing_jobs
-description: Count of API Fuzzing jobs run by job name
-product_section: sec
-product_stage: secure
-product_group: group::fuzz testing
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml b/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
deleted file mode 100644
index 8e7a97ab7d6..00000000000
--- a/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Optional
-key_path: counts.api_fuzzing_dnd_jobs
-description: Count of API Fuzzing `docker-in-docker` jobs run by job name
-product_section: sec
-product_stage: secure
-product_group: group::fuzz testing
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml b/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
deleted file mode 100644
index 58fba247d3f..00000000000
--- a/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: usage_activity_by_stage.secure.user_api_fuzzing_jobs
-description: Count of API Fuzzing jobs by job name
-product_section: sec
-product_stage: secure
-product_group: group::fuzz testing
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml b/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
deleted file mode 100644
index 417ea83e182..00000000000
--- a/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: usage_activity_by_stage.secure.user_api_fuzzing_dnd_jobs
-description: Count of API Fuzzing `docker-in-docker` jobs by job name
-product_section: sec
-product_stage: secure
-product_group: group::fuzz testing
-product_category:
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216180410_pool_repositories.yml b/config/metrics/counts_all/20210216180410_pool_repositories.yml
index 6dfda67824d..06a65c536dd 100644
--- a/config/metrics/counts_all/20210216180410_pool_repositories.yml
+++ b/config/metrics/counts_all/20210216180410_pool_repositories.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.pool_repositories
 description: Count of unique object pool repositories for fork deduplication
 product_section: dev
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180413_all_searches.yml b/config/metrics/counts_all/20210216180413_all_searches.yml
index dec74f68373..b9a3374b333 100644
--- a/config/metrics/counts_all/20210216180413_all_searches.yml
+++ b/config/metrics/counts_all/20210216180413_all_searches.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.all_searches
 description: Total Searches for All Basic Search and Advanced Search in self-managed
   and SaaS
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180414_navbar_searches.yml b/config/metrics/counts_all/20210216180414_navbar_searches.yml
index 01ae91462a7..5cceeecff8a 100644
--- a/config/metrics/counts_all/20210216180414_navbar_searches.yml
+++ b/config/metrics/counts_all/20210216180414_navbar_searches.yml
@@ -1,8 +1,7 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.navbar_searches
-description: Total Searches using the navbar for All Basic Search and Advanced Search in self-managed
-  and SaaS
+description: Total Searches using the navbar for All Basic Search and Advanced Search in self-managed and SaaS
 product_section: enablement
 product_stage: enablement
 product_group: group::global search
@@ -18,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180416_i_search_total.yml b/config/metrics/counts_all/20210216180416_i_search_total.yml
index 00371ea9e4b..0e8a7cfecf0 100644
--- a/config/metrics/counts_all/20210216180416_i_search_total.yml
+++ b/config/metrics/counts_all/20210216180416_i_search_total.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: search_unique_visits.i_search_total
 description: Calculated unique users to perform Basic or Advanced searches by week
 product_section: enablement
diff --git a/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
index 47f131d7cc0..67fac53ec4e 100644
--- a/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
+++ b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.issues_created_from_gitlab_error_tracking_ui
 description: Count of issues manually created from the GitLab UI on Sentry errors
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml b/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
index 2f947483328..c840150b205 100644
--- a/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
+++ b/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.issues_with_associated_zoom_link
 description: Count of issues where a user has linked a Zoom meeting
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml b/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
index 5b6daa1cf32..e69555757d8 100644
--- a/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
+++ b/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.issues_using_zoom_quick_actions
 description: Count of issues where a user have added AND removed a zoom meeting using
   slash commands
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml b/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
index 6db1b13b869..aebb69d4fe7 100644
--- a/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
+++ b/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.issues_with_embedded_grafana_charts_approx
 description: Count of issues where a user has embedded a Grafana chart
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
index 240b5ba0658..dcce2f4e366 100644
--- a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.issues_created_from_alerts
 description: Count of issues created automatically on alerts from GitLab-Managed Prometheus
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
index 2b9370adc13..373a5e6c262 100644
--- a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
+++ b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.issues_created_gitlab_alerts
 description: Count of all issues created from GitLab alerts (bot and non-bot)
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml b/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
index 2a7970405fc..a72f821f1e7 100644
--- a/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.issues_created_manually_from_alerts
 description: Count of issues created manually by non-bot users from GitLab alerts
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180447_incident_issues.yml b/config/metrics/counts_all/20210216180447_incident_issues.yml
index 63c5e548000..bc3dd346e4d 100644
--- a/config/metrics/counts_all/20210216180447_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180447_incident_issues.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.incident_issues
 description: Count of incidents (issues where issue_type=incident)
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
index b17a1a54a1e..5fa90b9f6c1 100644
--- a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.alert_bot_incident_issues
 description: Count of issues created by the alert bot automatically
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
index a39e19e8074..9764d0cba4c 100644
--- a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
+++ b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.incident_labeled_issues
 description: Count of all issues with the label=incident
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
index a873a1a9497..10f2abcfb84 100644
--- a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
+++ b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_creating_incidents
 description: Counts of Projects that have incident issues, regardless of status.
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
index 138dba197a5..c5c4a1e90bf 100644
--- a/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_error_tracking_enabled
 description: Count of projects that have enabled Error tracking via Sentry
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
index 408136edb73..f162e767cbe 100644
--- a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
+++ b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_alerts_service_enabled
 description: Count of projects that have enabled the Alerts service
 product_section: ops
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
index c636819a759..bfca848f0fd 100644
--- a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
+++ b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_alerts_created
 description: Count of projects with alerts created in given time period
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
index c93b4b91274..6b37f627c95 100644
--- a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
+++ b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_enabled_alert_integrations
 description: Count of projects with at least 1 enabled integration
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
index 06fe3da7371..b6de290e3ee 100644
--- a/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.monitor.projects_with_error_tracking_enabled
 description: Projects where error tracking is enabled
 product_section: ops
diff --git a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
index 70c8a60ebcf..5ed0d61b5d1 100644
--- a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
+++ b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.monitor.projects_with_incidents
 description: Count of unique projects with an incident
 product_section: ops
diff --git a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
index 092266e07d9..9a0d7e14566 100644
--- a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.monitor.projects_with_alert_incidents
 description: Count of unique projects with an incident from an alert
 product_section: ops
diff --git a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
index d3e4c6a4ee0..967e060db39 100644
--- a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.projects_imported_from_github
-description:
+description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
index a951a6dedb4..51dd7a63ba4 100644
--- a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.create.projects_imported_from_github
-description:
+description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
index 266b1eb34f6..f2ee013002c 100644
--- a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
+++ b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.unique_users_all_imports
 description: Distinct count of users that triggered any kind of import
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180634_gitlab.yml b/config/metrics/counts_all/20210216180634_gitlab.yml
index 258596516c6..c578ff7bab0 100644
--- a/config/metrics/counts_all/20210216180634_gitlab.yml
+++ b/config/metrics/counts_all/20210216180634_gitlab.yml
@@ -1,18 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.bulk_imports.gitlab
 description: Distinct count of users that triggered an import using the Group Migration
   tool
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180636_gitlab_v1.yml b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
index 76509b97083..80cf9db3e46 100644
--- a/config/metrics/counts_all/20210216180636_gitlab_v1.yml
+++ b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.bulk_imports.gitlab_v1
 description: Count of imports using GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180638_gitlab_project.yml b/config/metrics/counts_all/20210216180638_gitlab_project.yml
index 3fd5b1bb728..60f3a0e6bd6 100644
--- a/config/metrics/counts_all/20210216180638_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180638_gitlab_project.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.project_imports.gitlab_project
 description: Count of projects imported using Project Import/Export
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180639_gitlab.yml b/config/metrics/counts_all/20210216180639_gitlab.yml
index 4197eb9d211..66b4511cc75 100644
--- a/config/metrics/counts_all/20210216180639_gitlab.yml
+++ b/config/metrics/counts_all/20210216180639_gitlab.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.project_imports.gitlab
 description: Count of projects imported from GitLab.com
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180641_github.yml b/config/metrics/counts_all/20210216180641_github.yml
index 80a971ad997..6ebb762be0d 100644
--- a/config/metrics/counts_all/20210216180641_github.yml
+++ b/config/metrics/counts_all/20210216180641_github.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.project_imports.github
 description: Count of projects imported from GitHub
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180643_bitbucket.yml b/config/metrics/counts_all/20210216180643_bitbucket.yml
index 08c500fb719..1b683d1414d 100644
--- a/config/metrics/counts_all/20210216180643_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180643_bitbucket.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.project_imports.bitbucket
 description: Count of projects imported from Bitbucket
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180645_bitbucket_server.yml b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
index 9ec0e200755..a7d6481a0d1 100644
--- a/config/metrics/counts_all/20210216180645_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.project_imports.bitbucket_server
 description: Count of projects imported from Bitbucket Server
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180647_gitea.yml b/config/metrics/counts_all/20210216180647_gitea.yml
index 7439358b8bb..4cf1ebfd78f 100644
--- a/config/metrics/counts_all/20210216180647_gitea.yml
+++ b/config/metrics/counts_all/20210216180647_gitea.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.project_imports.gitea
 description: Count of projects imported from Gitea
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180649_git.yml b/config/metrics/counts_all/20210216180649_git.yml
index 56c02302944..9c60f4a2302 100644
--- a/config/metrics/counts_all/20210216180649_git.yml
+++ b/config/metrics/counts_all/20210216180649_git.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.project_imports.git
 description: Count of projects imported by URL
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180650_manifest.yml b/config/metrics/counts_all/20210216180650_manifest.yml
index 21281acc75a..ee1037328de 100644
--- a/config/metrics/counts_all/20210216180650_manifest.yml
+++ b/config/metrics/counts_all/20210216180650_manifest.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.project_imports.manifest
 description: Count of projects imported using manifst file
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180652_gitlab_migration.yml b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
index ca10c73e2ed..8aa45dee434 100644
--- a/config/metrics/counts_all/20210216180652_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.project_imports.gitlab_migration
 description: Count of projects imported using GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
diff --git a/config/metrics/counts_all/20210216180654_jira.yml b/config/metrics/counts_all/20210216180654_jira.yml
index fe94597bbea..7c7a2739576 100644
--- a/config/metrics/counts_all/20210216180654_jira.yml
+++ b/config/metrics/counts_all/20210216180654_jira.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage.manage.issue_imports.jira
 description: Count of projects imported from Jira
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180656_fogbugz.yml b/config/metrics/counts_all/20210216180656_fogbugz.yml
index f270f505fdb..2d4e5ddcc02 100644
--- a/config/metrics/counts_all/20210216180656_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180656_fogbugz.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.issue_imports.fogbugz
 description: Count of projects imported from fogbugz
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180658_phabricator.yml b/config/metrics/counts_all/20210216180658_phabricator.yml
index 6c485a575fd..e5cdd3f382b 100644
--- a/config/metrics/counts_all/20210216180658_phabricator.yml
+++ b/config/metrics/counts_all/20210216180658_phabricator.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.issue_imports.phabricator
 description: Count of projects imported from phabricator
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180700_csv.yml b/config/metrics/counts_all/20210216180700_csv.yml
index 2bf71cc3a20..b69251a5b0b 100644
--- a/config/metrics/counts_all/20210216180700_csv.yml
+++ b/config/metrics/counts_all/20210216180700_csv.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.issue_imports.csv
 description: Count of (attempted) imports from csv files
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180702_group_import.yml b/config/metrics/counts_all/20210216180702_group_import.yml
index 01e006f75c6..45e2650d69e 100644
--- a/config/metrics/counts_all/20210216180702_group_import.yml
+++ b/config/metrics/counts_all/20210216180702_group_import.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.group_imports.group_import
-description: Count of group imports using Group Import/Export
+description: Count of groups imported using Group Import/Export
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180703_gitlab_migration.yml b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
index cf40dc841ec..10b549ca252 100644
--- a/config/metrics/counts_all/20210216180703_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.group_imports.gitlab_migration
 description: Count of groups imported using GitLab Migration
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180705_total.yml b/config/metrics/counts_all/20210216180705_total.yml
index 69f8ec18d14..ca7cab549c1 100644
--- a/config/metrics/counts_all/20210216180705_total.yml
+++ b/config/metrics/counts_all/20210216180705_total.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.total
 description: Total count of all projects imported with import_source NOT NULL
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180707_gitlab_project.yml b/config/metrics/counts_all/20210216180707_gitlab_project.yml
index 9a0e3fa5fbf..3ed628fd20d 100644
--- a/config/metrics/counts_all/20210216180707_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180707_gitlab_project.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.gitlab_project
 description: 'Distinct count of users that imported projects using Project Import/Export'
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180709_gitlab.yml b/config/metrics/counts_all/20210216180709_gitlab.yml
index 6bfc09b0d42..d8c23badb74 100644
--- a/config/metrics/counts_all/20210216180709_gitlab.yml
+++ b/config/metrics/counts_all/20210216180709_gitlab.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.gitlab
 description: 'Distinct count of users that imported projects from GitLab.com'
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180711_github.yml b/config/metrics/counts_all/20210216180711_github.yml
index 807ef20c4eb..4c7444c7805 100644
--- a/config/metrics/counts_all/20210216180711_github.yml
+++ b/config/metrics/counts_all/20210216180711_github.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.github
 description: Distinct count of users that imported projects from GitHub
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180713_bitbucket.yml b/config/metrics/counts_all/20210216180713_bitbucket.yml
index fb9e0d83439..2d3dc154324 100644
--- a/config/metrics/counts_all/20210216180713_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180713_bitbucket.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.bitbucket
 description: 'Distinct count of users that imported projects from Bitbucket Cloud'
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180715_bitbucket_server.yml b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
index 99321d76dfd..82a675b5428 100644
--- a/config/metrics/counts_all/20210216180715_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.bitbucket_server
 description: 'Distinct count of users that imported projects from Bitbucket Server'
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180716_gitea.yml b/config/metrics/counts_all/20210216180716_gitea.yml
index a4a7ef23052..50d5923e377 100644
--- a/config/metrics/counts_all/20210216180716_gitea.yml
+++ b/config/metrics/counts_all/20210216180716_gitea.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.gitea
 description: 'Distinct count of users that imported projects from Gitea'
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180718_git.yml b/config/metrics/counts_all/20210216180718_git.yml
index 13befec6b07..f9f648bb713 100644
--- a/config/metrics/counts_all/20210216180718_git.yml
+++ b/config/metrics/counts_all/20210216180718_git.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.git
 description: 'Distinct count of users that imported projects using Import by URL'
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180720_manifest.yml b/config/metrics/counts_all/20210216180720_manifest.yml
index dcc9cc8df92..28b689eddcf 100644
--- a/config/metrics/counts_all/20210216180720_manifest.yml
+++ b/config/metrics/counts_all/20210216180720_manifest.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.manifest
 description: 'Distinct count of users that imported projects using Manifest file'
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180722_jira.yml b/config/metrics/counts_all/20210216180722_jira.yml
index 420fc4635df..add51bcf494 100644
--- a/config/metrics/counts_all/20210216180722_jira.yml
+++ b/config/metrics/counts_all/20210216180722_jira.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.issues_imported.jira
 description: Distinct count of users that imported issues into projects using Jira
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180724_fogbugz.yml b/config/metrics/counts_all/20210216180724_fogbugz.yml
index 1e1d587e434..45dd4ee1f50 100644
--- a/config/metrics/counts_all/20210216180724_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180724_fogbugz.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.issues_imported.fogbugz
 description: 'Distinct count of users that imported issues into projects using FogBugz'
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180726_phabricator.yml b/config/metrics/counts_all/20210216180726_phabricator.yml
index 1f4b2ed0460..c006ac22b75 100644
--- a/config/metrics/counts_all/20210216180726_phabricator.yml
+++ b/config/metrics/counts_all/20210216180726_phabricator.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.issues_imported.phabricator
 description: Distinct count of users that imported issues into projects using Phabricator
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180727_csv.yml b/config/metrics/counts_all/20210216180727_csv.yml
index a50733d361e..6a6f16e09ef 100644
--- a/config/metrics/counts_all/20210216180727_csv.yml
+++ b/config/metrics/counts_all/20210216180727_csv.yml
@@ -1,18 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.issues_imported.csv
 description: Distinct count of users that imported issues into projects using CSV
   upload
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180729_groups_imported.yml b/config/metrics/counts_all/20210216180729_groups_imported.yml
index 47f4a54cf8e..04e1febb437 100644
--- a/config/metrics/counts_all/20210216180729_groups_imported.yml
+++ b/config/metrics/counts_all/20210216180729_groups_imported.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.groups_imported
 description: Distinct count of users that imported groups using Group Import
 product_section: dev
 product_stage: manage
 product_group: group::import
-product_category:
+product_category: importers
 value_type: number
 status: deprecated
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
index a789d1ead6c..25326291509 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.wiki_pages_create
 description: Count of all Wiki pages created
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
index 3f5bd8804de..82736e363ae 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.wiki_pages_update
 description: Count of all Wiki page updates
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
index 40815a1f9be..26b88ba5c9f 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.wiki_pages_delete
 description: Count of all Wiki pages deleted
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
index 0b847692c91..3332d1963ba 100644
--- a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
+++ b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.design_management_designs_create
 description: Number of designs that were created
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
index 9c279bd9ac9..3911079ef56 100644
--- a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
+++ b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.design_management_designs_update
 description: Number of updates to designs
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
index c15b0dded7f..c6900276ef7 100644
--- a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
+++ b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.design_management_designs_delete
 description: Number of designs that were deleted
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml
index e760e1f29ef..6163cbab8ad 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups
 description: Total count of groups as of usage ping snapshot
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index 57273262561..d105e047d49 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.keys
 description: Number of keys.
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180754_events.yml b/config/metrics/counts_all/20210216180754_events.yml
index ced420e9865..8d1a58f1820 100644
--- a/config/metrics/counts_all/20210216180754_events.yml
+++ b/config/metrics/counts_all/20210216180754_events.yml
@@ -1,18 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.events
-description:
+description: Number of distinct users who have generated a manage event
 product_section: dev
-product_stage:
+product_stage: manage
 product_group: group::manage
 product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index 86a57dc8e45..938a95c5911 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.groups
 description: Number of users who are group members.
 product_section: dev
diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index fbc42eee84a..816887531b6 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.users_created
 description: Number of users
 product_section: dev
diff --git a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
index 9bbec19b9dc..f46bc3b8566 100644
--- a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
+++ b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.grafana_integrated_projects
 description: Total Grafana integrations attached to projects
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -14,3 +14,4 @@ distribution:
 - ce
 tier:
 - free
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
index a97c555acab..211115a0856 100644
--- a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: tracing
 value_type: number
@@ -11,9 +11,10 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
index c0771c4cc5f..9b4c7e4e145 100644
--- a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_prometheus_active
 description: Count of projects with active integrations for Prometheus
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
index 435b988918e..44f7150cb66 100644
--- a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_prometheus_active
 description: Count of groups with active integrations for Prometheus
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
index ea76bec86c3..eba4f2f5741 100644
--- a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_prometheus_active
 description: Count of active service templates for Prometheus
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
index 0be177459ca..3c03a3b2eae 100644
--- a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_prometheus_active
 description: Count of active instance-level integrations for Prometheus
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
index 5dcc4f0a0a8..d89a809a613 100644
--- a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_prometheus_active
 description: Count of active projects inheriting integrations for Prometheus
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
index ad4bd9bde96..0d3f11e9a1a 100644
--- a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_prometheus_active
 description: Count of active groups inheriting integrations for Prometheus
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
index fa99f4f9861..3038e53932c 100644
--- a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.operations_dashboard_default_dashboard
 description: Active users with enabled operations dashboard
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -11,9 +11,10 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
index 2427fbe95b5..4802532c053 100644
--- a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.operations_dashboard_users_with_projects_added
 description: Active users with projects on operations dashboard
 product_section: ops
-product_stage:
+product_stage: 
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -11,9 +11,10 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216180945_clusters.yml b/config/metrics/counts_all/20210216180945_clusters.yml
index 01d4aa22ff2..2294cd5e1de 100644
--- a/config/metrics/counts_all/20210216180945_clusters.yml
+++ b/config/metrics/counts_all/20210216180945_clusters.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.monitor.clusters
 description: Users creating clusters.
 product_section: ops
diff --git a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
index 7ce1bab9e40..a921b517b40 100644
--- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.monitor.clusters_applications_prometheus
 description: Users creating clusters with Prometheus enabled.
 product_section: ops
diff --git a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
index b42af45f821..278cd3d6337 100644
--- a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.monitor.operations_dashboard_default_dashboard
 description: Active users with enabled operations dashboard
 product_section: ops
diff --git a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
index ec0ac4b1f67..6d1d00cd1e3 100644
--- a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.monitor.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
diff --git a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
index f9e62f5fcc1..13971a4fc71 100644
--- a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.monitor.operations_dashboard_users_with_projects_added
 description: Active users with projects on operations dashboard
 product_section: ops
diff --git a/config/metrics/counts_all/20210216181009_lfs_objects.yml b/config/metrics/counts_all/20210216181009_lfs_objects.yml
index 6882c115094..cb8b2fc5474 100644
--- a/config/metrics/counts_all/20210216181009_lfs_objects.yml
+++ b/config/metrics/counts_all/20210216181009_lfs_objects.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.lfs_objects
-description:
+description: 
 product_section: ops
 product_stage: create
 product_group: group::create
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: all
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index b170aa2c14f..59edfc3634d 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_packages
 description: Projects with package registry enabled
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181012_packages.yml b/config/metrics/counts_all/20210216181012_packages.yml
index 6aaa7d161e0..ec5e1ae7831 100644
--- a/config/metrics/counts_all/20210216181012_packages.yml
+++ b/config/metrics/counts_all/20210216181012_packages.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.packages
 description: The total number of packages published to the registry
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
index 423da76d94a..14cefebb514 100644
--- a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
+++ b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_disabled
 description: The number of projects with cleanup policy for tags turned off
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
index c75684d655c..54ab06ea5c4 100644
--- a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
+++ b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled
 description: A count of projects with the cleanup policy for tags turned on
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
index 5f435cdb3c6..3b742c68758 100644
--- a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
+++ b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_1
 description: A count of projects with the cleanup policy set to keep 1 tag
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
index c5332f4c32c..1681e2c642e 100644
--- a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
+++ b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_5
 description: A count of projects with the cleanup policy set to keep 5 tags
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
index 662c7808c37..3f5ee49993a 100644
--- a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
+++ b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_10
 description: A count of projects with the cleanup policy set to keep 10 tags
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
index 657647f124c..a18a4fa12d8 100644
--- a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
+++ b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_25
 description: A count of projects with the cleanup policy set to keep 25 tags
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
index b25c6c2dbf7..bd7d576520e 100644
--- a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
+++ b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_50
 description: A count of projects with the cleanup policy set to keep 50 tags
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
index 6b4eca32468..420c428e46c 100644
--- a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
+++ b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_100
 description: A count of projects with the cleanup policy set to keep 100 tags
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
index 9e83a06612f..21cd670e5aa 100644
--- a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
+++ b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_1d
 description: A count of projects with the cleanup policy set to run every day
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
index a987f9be6e6..d6b0d0dc1d6 100644
--- a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_7d
 description: A count of projects with the cleanup policy set to run every 7 days
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
index 84ad8ccbdd4..9c4d4b83be9 100644
--- a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_14d
 description: A count of projects with the cleanup policy set to run every 14 days
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
index 267e4967e1c..963665a5ee0 100644
--- a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
+++ b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_1month
 description: A count of projects with the cleanup policy set to run monthly
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
index 908a9d75c2b..8fa068bb372 100644
--- a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
+++ b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_cadence_set_to_3month
 description: A count of projects with the cleanup policy set to run every 3 months
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
index f4138f6f566..3742446b11a 100644
--- a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_7d
 description: A count of projects with the cleanup policy set delete tags older than 7 days
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
index 3fada355ac1..1216a041bfb 100644
--- a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_14d
 description: A count of projects with the cleanup policy set delete tags older than 14 days
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
index 4578b623442..387bf3dff90 100644
--- a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
+++ b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_30d
 description: A count of projects with the cleanup policy set delete tags older than 30 days
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
index 1bc6632c56c..8dcfbc1ce02 100644
--- a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
+++ b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_90d
 description: A count of projects with the cleanup policy set delete tags older than 90 days
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
index 818f8fa4b5e..29fe874c89e 100644
--- a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
+++ b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_unset
 description: A count of projects with the cleanup policy with the number of tags to keep unset
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
index c0eaa5d4524..475b52f856f 100644
--- a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
+++ b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_unset
 description: A count of projects with the cleanup policy with the number of tags to delete unset
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181051_vendor.yml b/config/metrics/counts_all/20210216181051_vendor.yml
index 9411672a8ac..840054e4263 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: container_registry_server.vendor
 description: Identifies if a user is using an external container registry and what type
 product_section: ops
diff --git a/config/metrics/counts_all/20210216181055_projects_with_packages.yml b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
index cb7c7905b5d..99c51335b80 100644
--- a/config/metrics/counts_all/20210216181055_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.package.projects_with_packages
 description: Projects with package registry enabled
 product_section: ops
diff --git a/config/metrics/counts_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index b35585c5573..8777da9942f 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.issues
 description: Count of Issues created
 product_section: dev
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181104_label_lists.yml b/config/metrics/counts_all/20210216181104_label_lists.yml
index 6bf565b6f03..247e891e956 100644
--- a/config/metrics/counts_all/20210216181104_label_lists.yml
+++ b/config/metrics/counts_all/20210216181104_label_lists.yml
@@ -1,19 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.label_lists
-description: Count of label lists created on Boards 
+description: Count of label lists created on Boards
 product_section: dev
 product_stage: plan
-product_group: group::project management 
-product_category: boards 
+product_group: group::project management
+product_category: boards
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181108_milestones.yml b/config/metrics/counts_all/20210216181108_milestones.yml
index 7acb409c787..720c7ae0bc0 100644
--- a/config/metrics/counts_all/20210216181108_milestones.yml
+++ b/config/metrics/counts_all/20210216181108_milestones.yml
@@ -1,19 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.milestones
-description: Count of milestones created 
+description: Count of milestones created
 product_section: dev
-product_stage: plan 
+product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181109_uploads.yml b/config/metrics/counts_all/20210216181109_uploads.yml
index 568e0539dcb..42ba5feb46d 100644
--- a/config/metrics/counts_all/20210216181109_uploads.yml
+++ b/config/metrics/counts_all/20210216181109_uploads.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.uploads
 description: Count of Uploads via Notes and Descriptions
 product_section: dev
-product_stage: plan 
-product_group: group::project management 
+product_stage: plan
+product_group: group::project management
 product_category: issue_tracking
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181111_labels.yml b/config/metrics/counts_all/20210216181111_labels.yml
index 1011990edc4..3a0a200754e 100644
--- a/config/metrics/counts_all/20210216181111_labels.yml
+++ b/config/metrics/counts_all/20210216181111_labels.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.labels
 description: Count of Labels
 product_section: dev
-product_stage: plan 
+product_stage: plan
 product_group: group::project management
 product_category: issue_tracking
 value_type: number
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181113_notes.yml b/config/metrics/counts_all/20210216181113_notes.yml
index 035214da962..5d2c4a029e3 100644
--- a/config/metrics/counts_all/20210216181113_notes.yml
+++ b/config/metrics/counts_all/20210216181113_notes.yml
@@ -1,9 +1,9 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.notes
 description: Count of Notes across all objects that use them
 product_section: dev
-product_stage: plan 
+product_stage: plan
 product_group: group::project management
 product_category: issue_tracking
 value_type: number
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml
index da840704e26..6dbb1b910e1 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage.plan.issues
 description: Count of users creating Issues
 product_section: dev
diff --git a/config/metrics/counts_all/20210216181117_notes.yml b/config/metrics/counts_all/20210216181117_notes.yml
index 9dc9a2b7b70..20aa29d6d6f 100644
--- a/config/metrics/counts_all/20210216181117_notes.yml
+++ b/config/metrics/counts_all/20210216181117_notes.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.plan.notes
 description: Count of users creating Notes on Issues
 product_section: dev
diff --git a/config/metrics/counts_all/20210216181119_projects.yml b/config/metrics/counts_all/20210216181119_projects.yml
index 053525815f2..5384bacfec2 100644
--- a/config/metrics/counts_all/20210216181119_projects.yml
+++ b/config/metrics/counts_all/20210216181119_projects.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.plan.projects
 description: Count of users creating projects
 product_section: dev
diff --git a/config/metrics/counts_all/20210216181121_todos.yml b/config/metrics/counts_all/20210216181121_todos.yml
index d6eedbb8288..562e7be5666 100644
--- a/config/metrics/counts_all/20210216181121_todos.yml
+++ b/config/metrics/counts_all/20210216181121_todos.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.plan.todos
 description: Count of users todos created
 product_section: dev
diff --git a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
index 1558207c2e0..73c975ecd1e 100644
--- a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
@@ -1,18 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.plan.service_desk_enabled_projects
-description:
+description: Count creator ids from projects with service desk enabled
 product_section: dev
-product_stage:
+product_stage: plan
 product_group: group::plan
-product_category:
+product_category: service_desk
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181124_service_desk_issues.yml b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
index d9bf957ee47..521d0f42fbe 100644
--- a/config/metrics/counts_all/20210216181124_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
@@ -1,18 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.plan.service_desk_issues
-description:
+description: Count of service desk issues
 product_section: dev
-product_stage:
+product_stage: plan
 product_group: group::plan
-product_category:
+product_category: service_desk
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181126_projects_jira_active.yml b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
index 5b090a23958..de8f7e5e578 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.plan.projects_jira_active
-description:
+description: Distinct count of creator_id from projects with an active Jira integration.
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
index fe4065871a7..6dca1863e3e 100644
--- a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.plan.projects_jira_dvcs_cloud_active
-description:
+description: Distinct count of creator_id from projects with an active Jira Cloud DVCS integration.
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: ecosystem
+product_group: group::integration
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
index 77df3bac77e..2f37969e8ad 100644
--- a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.plan.projects_jira_dvcs_server_active
-description:
+description: Distinct count of creator_id from projects with an active Jira Server DVCS integration.
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: ecosystem
+product_group: group::integration
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181134_epics.yml b/config/metrics/counts_all/20210216181134_epics.yml
index 8b87f64a4e1..339956d84df 100644
--- a/config/metrics/counts_all/20210216181134_epics.yml
+++ b/config/metrics/counts_all/20210216181134_epics.yml
@@ -1,17 +1,16 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage.plan.epics
-description:
+description: Count distinct author ids from epics
 product_section: dev
-product_stage:
+product_stage: plan
 product_group: group::plan
-product_category:
+product_category: epics
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- premium
diff --git a/config/metrics/counts_all/20210216181135_label_lists.yml b/config/metrics/counts_all/20210216181135_label_lists.yml
index 7d2899b7da9..f3f9d84993b 100644
--- a/config/metrics/counts_all/20210216181135_label_lists.yml
+++ b/config/metrics/counts_all/20210216181135_label_lists.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.plan.label_lists
 description: Count of users creating label lists on Boards
 product_section: dev
diff --git a/config/metrics/counts_all/20210216181249_feature_flags.yml b/config/metrics/counts_all/20210216181249_feature_flags.yml
index 9b424c243be..17435693673 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.feature_flags
 description: Number of feature flag toggles
 product_section: ops
 product_stage: release
-product_group: group::progressive delivery
-product_category:
+product_group: group::release
+product_category: feature_flags
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181252_boards.yml b/config/metrics/counts_all/20210216181252_boards.yml
index 500b4c0dd31..91370f6192f 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.boards
 description: Count of Boards created
 product_section: dev
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index 4892e8ae9a5..ce9659cccc4 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.projects
 description: Count of Projects created
 product_section: dev
@@ -12,8 +12,9 @@ time_frame: all
 data_source: database
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181256_todos.yml b/config/metrics/counts_all/20210216181256_todos.yml
index 25cf4edcf60..ab13c2b8d11 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.todos
 description: Count of todos created
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
index 1fe81b25b4e..13b0f38d16a 100644
--- a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
+++ b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.jira_imports_total_imported_count
 description: Count of Jira imports completed
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: jira_importer
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
index e276c2caec7..4d807c3d333 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.jira_imports_projects_count
 description: Count of Projects that imported Issues from Jira
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: jira_importer
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
index 99fb076dbe5..d20eaa11b41 100644
--- a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
+++ b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.jira_imports_total_imported_issues_count
 description: Count of total issues imported via the Jira Importer
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: jira_importer
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181908_deploy_keys.yml b/config/metrics/counts_all/20210216181908_deploy_keys.yml
index fcd6a193ca2..5d144cdb855 100644
--- a/config/metrics/counts_all/20210216181908_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216181908_deploy_keys.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.deploy_keys
-description:
+description: Count of deploy keys
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181911_successful_deployments.yml b/config/metrics/counts_all/20210216181911_successful_deployments.yml
index 7ce7f26a17c..d02c5ee2d8b 100644
--- a/config/metrics/counts_all/20210216181911_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181911_successful_deployments.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.successful_deployments
 description: Total successful deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181912_failed_deployments.yml b/config/metrics/counts_all/20210216181912_failed_deployments.yml
index 83cce6392b5..db7532c9e5b 100644
--- a/config/metrics/counts_all/20210216181912_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181912_failed_deployments.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.failed_deployments
 description: Total failed deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181914_environments.yml b/config/metrics/counts_all/20210216181914_environments.yml
index efb8570a3e6..86958d713b6 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.environments
 description: Total available and stopped environments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181916_in_review_folder.yml b/config/metrics/counts_all/20210216181916_in_review_folder.yml
index 09a8f842a06..17cc4f8b730 100644
--- a/config/metrics/counts_all/20210216181916_in_review_folder.yml
+++ b/config/metrics/counts_all/20210216181916_in_review_folder.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_review_folder
-description:
+description: A number of environments with name review/*
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181918_releases.yml b/config/metrics/counts_all/20210216181918_releases.yml
index 5ce068be420..caf35bd5245 100644
--- a/config/metrics/counts_all/20210216181918_releases.yml
+++ b/config/metrics/counts_all/20210216181918_releases.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.releases
-description: Unique release tags
+description: Count of releases
 product_section: ops
-product_stage:
+product_stage: releases
 product_group: group::release
-product_category:
+product_category: release_orchestration
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181926_deployments.yml b/config/metrics/counts_all/20210216181926_deployments.yml
index 6cc7e7d7575..36d5b11c115 100644
--- a/config/metrics/counts_all/20210216181926_deployments.yml
+++ b/config/metrics/counts_all/20210216181926_deployments.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.release.deployments
 description: Unique users triggering deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181928_failed_deployments.yml b/config/metrics/counts_all/20210216181928_failed_deployments.yml
index 7cd10c9540a..36346541dd0 100644
--- a/config/metrics/counts_all/20210216181928_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181928_failed_deployments.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.release.failed_deployments
 description: Total failed deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181930_releases.yml b/config/metrics/counts_all/20210216181930_releases.yml
index bcb81558888..e14885bd330 100644
--- a/config/metrics/counts_all/20210216181930_releases.yml
+++ b/config/metrics/counts_all/20210216181930_releases.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.release.releases
 description: Unique users creating release tags
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: release_orchestration
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181932_successful_deployments.yml b/config/metrics/counts_all/20210216181932_successful_deployments.yml
index 4f59431b5ab..23dee12d855 100644
--- a/config/metrics/counts_all/20210216181932_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181932_successful_deployments.yml
@@ -1,17 +1,19 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.release.successful_deployments
 description: Total successful deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181946_pages_domains.yml b/config/metrics/counts_all/20210216181946_pages_domains.yml
index 4aaccd68c87..4952ae14614 100644
--- a/config/metrics/counts_all/20210216181946_pages_domains.yml
+++ b/config/metrics/counts_all/20210216181946_pages_domains.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.pages_domains
 description: Total GitLab Pages domains
 product_section: ops
 product_stage: release
-product_group: group::release management
-product_category:
+product_group: group::release
+product_category: pages
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
index 61751d2aed3..11251ac89c5 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.verify.clusters_applications_runner
 description: Count of users creating managed clusters with Runner enabled
 product_section: ops
diff --git a/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml b/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml
index 39fc30c9153..0d4d7ab0524 100644
--- a/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml
+++ b/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage.secure.user_unique_users_all_secure_scanners
 description:
 product_section: sec
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index 608e1648872..8b03e3891f0 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.remote_mirrors
 description: Count of total remote mirrors. Includes both push and pull mirrors
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 82ef272d2d1..116442201b0 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.commit_comment
 description: Count of total unique commit comments. Does not include MR diff comments
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index aecc9429dbc..2b36e8e883e 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.source_code_pushes
 description: Count of total Git push operations
 product_section: dev
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: redis
+instrumentation_class: RedisMetric
+options:
+  counter_class: SourceCodeCounter
+  event: pushes
 distribution:
 - ce
 - ee
@@ -17,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182010_deploy_keys.yml b/config/metrics/counts_all/20210216182010_deploy_keys.yml
index a05b821dd26..862b7a46b40 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.create.deploy_keys
 description: Count of users creating deploy keys.
 product_section: dev
diff --git a/config/metrics/counts_all/20210216182012_keys.yml b/config/metrics/counts_all/20210216182012_keys.yml
index 6096dccad18..b1f53628e90 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.create.keys
 description: Count of users creating regular keys.
 product_section: dev
diff --git a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
index 3639ddb0b2e..886de35954d 100644
--- a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.create.projects_with_disable_overriding_approvers_per_merge_request
 description: Total count of projects that do not allow overriding approvers on discrete merge requests
 product_section: dev
diff --git a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
index 0ba200e71f6..96e21c1bdb3 100644
--- a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.create.projects_without_disable_overriding_approvers_per_merge_request
 description: Count of total projects that do not disable overriding approvers per discrete merge request
 product_section: dev
diff --git a/config/metrics/counts_all/20210216182017_remote_mirrors.yml b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
index 6826ebf8d4b..60689e01bcc 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.create.remote_mirrors
 description: Count of users creating projects with remote mirrors.
 product_section: dev
diff --git a/config/metrics/counts_all/20210216182112_sast_jobs.yml b/config/metrics/counts_all/20210216182112_sast_jobs.yml
index 9813ac4051a..10e0b0c0532 100644
--- a/config/metrics/counts_all/20210216182112_sast_jobs.yml
+++ b/config/metrics/counts_all/20210216182112_sast_jobs.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.sast_jobs
 description: Count of SAST CI jobs for the month. Job names ending in '-sast'
 product_section: sec
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml b/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
index 2203501bdb0..b6e603499eb 100644
--- a/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
+++ b/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: counts.secret_detection_jobs
 description: Count of all 'secret-detection' CI jobs.
 product_section: sec
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182116_user_sast_jobs.yml b/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
index d10010cff4f..a79c1ebeb2f 100644
--- a/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
+++ b/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage.secure.user_sast_jobs
 description: Count of SAST jobs per user
 product_section: sec
diff --git a/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml b/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
index 3711f1591c9..7d5f638bf73 100644
--- a/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
+++ b/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: usage_activity_by_stage.secure.user_secret_detection_jobs
 description: Count of Secret Detection Jobs per user
 product_section: sec
diff --git a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
index aef5e02d715..a07ce8ed1bb 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.protected_branches_except_default
 description: Count of branches that have been protected and are not the default branch
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
index 4d515f30344..02b47c9a2a6 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_datadog_active
 description: 'Count of projects with active integrations for Datadog'
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
index 93ca67dc3ce..4379dbfba7a 100644
--- a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_datadog_active
 description: Count of groups with active integrations for Datadog
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
index a6289208f8d..b6ad06d9801 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_datadog_active
 description: Count of active service templates for Datadog
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
index 22f56981921..772639560f4 100644
--- a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_datadog_active
 description: Count of active instance-level integrations for Datadog
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
index f54966e5667..2badb2dd83f 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_datadog_active
 description: Count of active projects inheriting integrations for Datadog
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
index 7d04dd3529f..08dd3318dd4 100644
--- a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_datadog_active
 description: Count of active groups inheriting integrations for Datadog
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
index a18cce03cd2..3cdc44868d0 100644
--- a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_ewm_active
 description: 'Count of projects with active integrations for EWM'
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
index 21e14873f14..5e1336e59ff 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_ewm_active
 description: Count of groups with active integrations for EWM
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
index 3061917fc4c..8be6bdf0c59 100644
--- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_ewm_active
 description: Count of active service templates for EWM
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
index 5942a6cecee..ccc502535c9 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_ewm_active
 description: Count of active instance-level integrations for EWM
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
index ff075f9fa4c..8670903142b 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_ewm_active
 description: Count of active projects inheriting integrations for EWM
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
index e8d30fe06da..1e8c2575160 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_ewm_active
 description: Count of active groups inheriting integrations for EWM
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
index edcb3cf0bd2..71a6b44ffa8 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_mock_ci_active
 description: Count of projects with active integrations for Mock CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
index 26586a7a8e0..bdfb6260be3 100644
--- a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_mock_ci_active
 description: Count of groups with active integrations for Mock CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
index da5595571b0..a210d3205ad 100644
--- a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_mock_ci_active
 description: Count of active service templates for Mock CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
index 8176ad143c3..e0cf0fd30a1 100644
--- a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_mock_ci_active
 description: Count of active instance-level integrations for  Mock CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
index 5b9043aad79..f9e6b6ee4d4 100644
--- a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_mock_ci_active
 description: Count of active projects inheriting integrations for Mock CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
index 5d0138e4091..3e53603ed9f 100644
--- a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_mock_ci_active
 description: Count of active groups inheriting integrations for Mock CI
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
index 63cd3fecf7c..378114f9294 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_mock_monitoring_active
 description: Count of projects with active integrations for Mock Monitoring
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
index fe9baa11630..231d643bde6 100644
--- a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_mock_monitoring_active
 description: Count of groups with active integrations for Mock Monitoring
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
index 00fa0215ac5..3b7659c108e 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.templates_mock_monitoring_active
 description: Count of active service templates for Mock Monitoring
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
index b58943d95d1..b82600ae33a 100644
--- a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.instances_mock_monitoring_active
 description: Count of active instance-level integrations for  Mock Monitoring
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
index 91b93d10ead..71f7ff03adc 100644
--- a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.projects_inheriting_mock_monitoring_active
 description: Count of active projects inheriting integrations for Mock Monitoring
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
index a1ef1252dfa..dcbcf74bf5d 100644
--- a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.groups_inheriting_mock_monitoring_active
 description: Count of active groups inheriting integrations for Mock Monitoring
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: number
 status: removed
diff --git a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
index da0a9cbe25b..a7917d3ed3e 100644
--- a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
+++ b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_composer_delete_package
 description: A count of Composer packages that have been deleted
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
index 2b02ebf2aca..543a3a7c0bb 100644
--- a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
+++ b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_composer_pull_package
 description: A count of Composer packages that have been downloaded
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
index f52332c2248..ea346af7322 100644
--- a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
+++ b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_composer_push_package
 description: A count of Composer packages that have been published
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
index ddc7c9708c5..07f4d151a2d 100644
--- a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
+++ b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_conan_delete_package
 description: A count of Conan packages that have been deleted
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
index 1c7b9619168..e9fbb042995 100644
--- a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
+++ b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_conan_pull_package
 description: A count of Conan packages that have been downloaded
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
index c87ed74070d..668c7668e94 100644
--- a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
+++ b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_conan_push_package
 description: A count of Conan packages that have been published
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
index a98b839d299..f33d1fc3299 100644
--- a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
+++ b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_container_delete_package
 description: A count of container images that have been deleted
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
index cbf3b097b6f..e1aa7ddc683 100644
--- a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
+++ b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_container_pull_package
 description: A count of container images that have been downloaded
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
index d939cbcd931..4d64f574912 100644
--- a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
+++ b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_container_push_package
 description: A count of container images that have been published
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
index e0f63656b3c..e0256f563a8 100644
--- a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
+++ b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_debian_delete_package
 description: A count of Debian packages that have been deleted
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
index ecf1ca05da8..61cebf44a73 100644
--- a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
+++ b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_debian_pull_package
 description: A count of Debian packages that have been downloaded
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
index 7c91339b282..2fb6e56c49a 100644
--- a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
+++ b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_debian_push_package
 description: A count of Debian packages that have been published
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
index 012d756ff29..4ab016f854d 100644
--- a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
+++ b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_delete_package
 description: A count of packages that have been deleted
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
index 8babf39989a..45490ab93d6 100644
--- a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_delete_package_by_deploy_token
 description: A count of packages that have been deleted using a Deploy Token
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
index 1abc0fbc116..4c1a0729633 100644
--- a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_delete_package_by_guest
 description: A count of packages that have been deleted using a Guest
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
index 279caecac84..e46db03bfaa 100644
--- a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
+++ b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_delete_package_by_user
 description: A count of packages that have been deleted using a logged in user
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
index fd67e83e7e6..c1ee7742636 100644
--- a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
+++ b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_generic_delete_package
 description: A count of generic packages that have been deleted
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
index 6dc7c95f21a..1a31301c8a5 100644
--- a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
+++ b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_generic_pull_package
 description: A count of generic packages that have been downloaded
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
index 25b9ef192b5..ab3c69f7eed 100644
--- a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
+++ b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_generic_push_package
 description: A count of generic packages that have been published
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
index 7950eb474a3..2af3db1ed2c 100644
--- a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
+++ b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_golang_delete_package
 description: A count of Go modules that have been deleted
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
index ff959ac3e98..ffae5c6efa4 100644
--- a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
+++ b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_golang_pull_package
 description: A count of Go modules that have been downloaded
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
index 767b4c5b2b1..babfe6c3507 100644
--- a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
+++ b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_golang_push_package
 description: A count of Go modules that have been published
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
index 5f358229c12..176996e3447 100644
--- a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
+++ b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_maven_delete_package
 description: A count of Maven packages that have been deleted
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
index 7a978c4849c..e589314f06f 100644
--- a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
+++ b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_maven_pull_package
 description: A count of Maven packages that have been downloaded
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
index 2681085ac8d..4610a24c51f 100644
--- a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
+++ b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_maven_push_package
 description: A count of Maven packages that have been published
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
index dd410f89789..e540e68355a 100644
--- a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
+++ b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_npm_delete_package
 description: A count of npm packages that have been deleted
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
index e93e3a358ca..d2af5aa56c8 100644
--- a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
+++ b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_npm_pull_package
 description: A count of npm packages that have been downloaded
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
index a9c614feac9..653fba58565 100644
--- a/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
+++ b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_npm_push_package
 description: A count of npm packages that have been published
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
index c80830ee7b1..82a5509cd03 100644
--- a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
+++ b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_nuget_delete_package
 description: A count of NuGet packages that have been deleted
 product_section: ops
diff --git a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
index 1f2c87db111..5327b10ecf5 100644
--- a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
+++ b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_nuget_pull_package
 description: A count of NuGet packages that have been downloaded
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
index c95aac148f6..e8b0a0e7fb5 100644
--- a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
+++ b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_nuget_push_package
 description: A count of NuGet packages that have been published
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
index b4bad0722a9..f3484ae5b41 100644
--- a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
+++ b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_pull_package
 description: A count of packages that have been downloaded from the package registry
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
index b20ebc21ff1..183abf834dd 100644
--- a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_pull_package_by_deploy_token
 description: A count of packages that have been downloaded from the package registry using a Deploy Token
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
index f2e6d384210..bad5254aac4 100644
--- a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_pull_package_by_guest
 description: A count of packages that have been downloaded from the package registry by a guest
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
index 7ade3466544..f5e450cae7a 100644
--- a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_pull_package_by_user
 description: A count of packages that have been downloaded from the package registry by a user
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
index 80e82966328..bbcd3e82234 100644
--- a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
+++ b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_push_package
 description: A count of packages that have been published to the package registry
 product_section: ops
@@ -9,7 +9,7 @@ product_category: package registry
 value_type: number
 status: data_available
 time_frame: all
-data_source:  redis
+data_source: redis
 distribution:
 - ee
 - ce
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
index 68cb5659884..3a37af76f73 100644
--- a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_push_package_by_deploy_token
 description: A count of packages that have been published to the package registry using a deploy token
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
index f8193329f77..2f241519d3d 100644
--- a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_push_package_by_guest
 description: A count of packages that have been published to the package registry by a Guest
 product_section: ops
diff --git a/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml b/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
index adad2ea4451..25b3932ad67 100644
--- a/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_push_package_by_user
 description: A count of packages that have been published to the package registry by a user
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
index dcd35a737d8..2a90a151a53 100644
--- a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
+++ b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_pypi_delete_package
 description: A count of Python packages that have been deleted from the package registry
 product_section: ops
diff --git a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
index 54b4320cae9..0efeac2f9d1 100644
--- a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
+++ b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_pypi_pull_package
 description: A count of Python packages that have been downloaded from the package registry
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
index 336f343a7fc..75c91704892 100644
--- a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
+++ b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_pypi_push_package
 description: A count of Python packages that have been published to the package registry
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
index 3fb42a6f916..06217938d8e 100644
--- a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
+++ b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_tag_delete_package
 description: A count of package tags that have been deleted from the package registry
 product_section: ops
diff --git a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
index 0a9be3d713a..b96c1866a17 100644
--- a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
+++ b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_tag_pull_package
 description: A count of package tags that have been downloaded from the package registry
 product_section: ops
diff --git a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
index 666dc88da46..264a9773f7b 100644
--- a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
+++ b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_tag_push_package
 description: A count of package tags that have been published to the package registry
 product_section: ops
diff --git a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
index 41bb80ec9e0..75403722e5c 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.wiki_pages_view
 description: ''
 product_section: ''
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml b/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
deleted file mode 100644
index 432458bb371..00000000000
--- a/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Optional
-key_path: counts.coverage_fuzzing_jobs
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml b/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
deleted file mode 100644
index a4a5197aec2..00000000000
--- a/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Optional
-key_path: counts.dast_on_demand_pipelines
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index efe0e1c5bfe..1f738f7ea73 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.omniauth_providers
 description: Number of unique user logins using an OmniAuth provider
 product_section: dev
diff --git a/config/metrics/counts_all/20210216183402_two-factor.yml b/config/metrics/counts_all/20210216183402_two-factor.yml
index 2d1aed6115a..623c67195ce 100644
--- a/config/metrics/counts_all/20210216183402_two-factor.yml
+++ b/config/metrics/counts_all/20210216183402_two-factor.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor
 description: Number of unique user logins using two factor authentication
 product_section: dev
diff --git a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml b/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
index 28aa20c33ad..5bbe08b623c 100644
--- a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
+++ b/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor-via-u2f-device
 description: Number of unique user logins using two factor via a U2F device
 product_section: dev
diff --git a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml b/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
index b0e93f08989..adc75690057 100644
--- a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
+++ b/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor-via-webauthn-device
 description: Number of unique user logins using two factor via a WebAuthn device
 product_section: dev
diff --git a/config/metrics/counts_all/20210216183408_standard.yml b/config/metrics/counts_all/20210216183408_standard.yml
index 21267298f1a..b43bd25031b 100644
--- a/config/metrics/counts_all/20210216183408_standard.yml
+++ b/config/metrics/counts_all/20210216183408_standard.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.user_auth_by_provider.standard
 description: Number of unique user logins using password authentication
 product_section: dev
diff --git a/config/metrics/counts_all/20210216183410_google_oauth2.yml b/config/metrics/counts_all/20210216183410_google_oauth2.yml
index 24fd143171c..205b8dadbb0 100644
--- a/config/metrics/counts_all/20210216183410_google_oauth2.yml
+++ b/config/metrics/counts_all/20210216183410_google_oauth2.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.user_auth_by_provider.google_oauth2
 description: Number of unique user logins using Google OAuth authentication
 product_section: dev
diff --git a/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml b/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
deleted file mode 100644
index 014e6f16623..00000000000
--- a/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-data_category: Operational
-key_path: usage_activity_by_stage.secure.user_coverage_fuzzing_jobs
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: all
-data_source:
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml b/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
index 448d5cb0fba..de7af7b7e59 100644
--- a/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
+++ b/config/metrics/counts_all/20210303153000_package_events_i_package_rubygems_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_rubygems_delete_package
 description: Total count of RubyGems packages delete events
 product_section: ops
diff --git a/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml b/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
index c7364ce8663..c71c378c917 100644
--- a/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
+++ b/config/metrics/counts_all/20210303153002_package_events_i_package_rubygems_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_rubygems_pull_package
 description: Total count of pull RubyGems packages events
 product_section: ops
diff --git a/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml b/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
index 05584e02c45..025e47c0d04 100644
--- a/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
+++ b/config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_rubygems_push_package
 description: Total count of push RubyGems packages events
 product_section: ops
diff --git a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
index 5962998fef3..ad2f6bce59e 100644
--- a/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
+++ b/config/metrics/counts_all/20210309165717_projects_with_enabled_alert_integrations_histogram.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.monitor.projects_with_enabled_alert_integrations_histogram
 description: Histogram (buckets 1 to 100) of projects with at least 1 enabled integration.
 product_section: ops
diff --git a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
index 59b933c812f..3fb804b9a92 100644
--- a/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
+++ b/config/metrics/counts_all/20210410012200_package_events_i_package_terraform_module_delete_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_terraform_module_delete_package
 description: Total count of Terraform Module packages delete events
 product_section: ops
diff --git a/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml b/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
index 859f436ee69..bbd5c978794 100644
--- a/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
+++ b/config/metrics/counts_all/20210410012202_package_events_i_package_terraform_module_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_terraform_module_pull_package
 description: Total count of pull Terraform Module packages events
 product_section: ops
diff --git a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
index 9a890ee943a..fd2f969251f 100644
--- a/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
+++ b/config/metrics/counts_all/20210410012204_package_events_i_package_terraform_module_push_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_terraform_module_push_package
 description: Total count of push Terraform Module packages events
 product_section: ops
diff --git a/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml b/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml
index 82b7447bd48..45eebbcca09 100644
--- a/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml
+++ b/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: analytics_unique_visits.i_analytics_dev_ops_adoption
 name: "<please fill metric name, suggested format is: {subject}_{verb}{ing|ed}_{object} eg: users_creating_epics or merge_requests_viewed_in_single_file_mode>"
 description:
diff --git a/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml b/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml
index 2447a5c1880..f8577a6d0cb 100644
--- a/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml
+++ b/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.enablement.geo_secondary_web_oauth_users
 name: ""
 description:
diff --git a/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml b/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml
index 8838e57a7a3..f342e7ef82b 100644
--- a/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml
+++ b/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: analytics_unique_visits.users_viewing_analytics_group_devops_adoption
 name: "<please fill metric name, suggested format is: {subject}_{verb}{ing|ed}_{object} eg: users_creating_epics or merge_requests_viewed_in_single_file_mode>"
 description:
diff --git a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
index e108406ef11..69fffdf6283 100644
--- a/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
+++ b/config/metrics/counts_all/20210502045402_ci_runners_instance_type_active.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.ci_runners_instance_type_active
 name: "count_active_instance_ci_runners"
 description: Total active Shared (Instance) Runners
diff --git a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
index 6fe5d74a7e7..7edc7086c22 100644
--- a/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
+++ b/config/metrics/counts_all/20210502050341_ci_runners_group_type_active.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.ci_runners_group_type_active
 name: "count_active_group_ci_runners"
 description: Total active Group Runners
diff --git a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
index eaf9a3b5dd7..66f0c6ad976 100644
--- a/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
+++ b/config/metrics/counts_all/20210502050834_ci_runners_project_type_active.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.ci_runners_project_type_active
 name: "count_active_project_ci_runners"
 description: Total active Specific (Project) Runners
diff --git a/config/metrics/counts_all/20210502050942_ci_runners_online.yml b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
index 7e63e095cd4..7a2752ac152 100644
--- a/config/metrics/counts_all/20210502050942_ci_runners_online.yml
+++ b/config/metrics/counts_all/20210502050942_ci_runners_online.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.ci_runners_online
 name: "counts_online_runners"
 description: Total online Runners of all types
diff --git a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
index 2e451b5955e..e32f288e8c9 100644
--- a/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051651_ci_runners_instance_type_active_online.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.ci_runners_instance_type_active_online
 name: "count_instance_active_online_ci_runners"
 description: Total active and online Shared (Instance) Runners
diff --git a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
index 30c6432d611..10e1eeb6ceb 100644
--- a/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
+++ b/config/metrics/counts_all/20210502051922_ci_runners_group_type_active_online.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.ci_runners_group_type_active_online
 name: "count_group_active_online_ci_runners"
 description: Total active and online Group Runners
diff --git a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
index 8f47542eac2..f3628f18f60 100644
--- a/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
+++ b/config/metrics/counts_all/20210502052036_ci_runners_project_type_active_online.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.ci_runners_project_type_active_online
 name: "count_project_active_online_ci_runners"
 description: Total active and online Specific (Project) Runners
diff --git a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
index 133b85c00e4..2d5b7e3b7a0 100644
--- a/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
+++ b/config/metrics/counts_all/20210510201537_in_product_marketing_email_create_0_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_create_0_sent
 name: "count_sent_first_email_of_the_create_track_for_in_product_marketing_emails"
 description: Total sent emails of the create track's first email
diff --git a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
index 70531344912..877f7119f3f 100644
--- a/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510201919_in_product_marketing_email_create_0_cta_clicked.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_create_0_cta_clicked
 name: "count_clicks_on_the_first_email_of_the_create_track_for_in_product_marketing_emails"
 description: Total clicks on the create track's first email
diff --git a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
index 9f6fff093d3..5d34d5b5803 100644
--- a/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
+++ b/config/metrics/counts_all/20210510202148_in_product_marketing_email_create_1_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_create_1_sent
 name: "count_sent_second_email_of_the_create_track_for_in_product_marketing_emails"
 description: Total sent emails of the create track's second email
diff --git a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
index da16bdfc514..d57303b1241 100644
--- a/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202356_in_product_marketing_email_create_1_cta_clicked.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_create_1_cta_clicked
 name: "count_clicks_on_the_second_email_of_the_create_track_for_in_product_marketing_emails"
 description: Total clicks on the create track's second email
diff --git a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
index ce00d9d1ba4..8d89567d015 100644
--- a/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
+++ b/config/metrics/counts_all/20210510202604_in_product_marketing_email_create_2_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_create_2_sent
 name: "count_sent_third_email_of_the_create_track_for_in_product_marketing_emails"
 description: Total sent emails of the create track's third email
diff --git a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
index 6eae1b19cbb..047e6d4383b 100644
--- a/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202724_in_product_marketing_email_create_2_cta_clicked.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_create_2_cta_clicked
 name: "count_clicks_on_the_third_email_of_the_create_track_for_in_product_marketing_emails"
 description: Total clicks on the create track's third email
diff --git a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
index bc66d1bdb47..0dcefe7cc18 100644
--- a/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
+++ b/config/metrics/counts_all/20210510202807_in_product_marketing_email_verify_0_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_verify_0_sent
 name: "count_sent_first_email_of_the_verify_track_for_in_product_marketing_emails"
 description: Total sent emails of the verify track's first email
diff --git a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
index 525ab313b17..f9ed322c94a 100644
--- a/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510202943_in_product_marketing_email_verify_0_cta_clicked.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_verify_0_cta_clicked
 name: "count_clicks_on_the_first_email_of_the_verify_track_for_in_product_marketing_emails"
 description: Total clicks on the verify track's first email
diff --git a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
index 2279f54232a..a5432f3f08e 100644
--- a/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
+++ b/config/metrics/counts_all/20210510202955_in_product_marketing_email_verify_1_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_verify_1_sent
 name: "count_sent_second_email_of_the_verify_track_for_in_product_marketing_emails"
 description: Total sent emails of the verify track's second email
diff --git a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
index a346e17801a..33fc65ef90e 100644
--- a/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203005_in_product_marketing_email_verify_1_cta_clicked.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_verify_1_cta_clicked
 name: "count_clicks_on_the_second_email_of_the_verify_track_for_in_product_marketing_emails"
 description: Total clicks on the verify track's second email
diff --git a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
index 573a8e4c18c..b6a8165a0ad 100644
--- a/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
+++ b/config/metrics/counts_all/20210510203015_in_product_marketing_email_verify_2_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_verify_2_sent
 name: "count_sent_third_email_of_the_verify_track_for_in_product_marketing_emails"
 description: Total sent emails of the verify track's third email
diff --git a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
index 39e4b91f52c..f7a1116c011 100644
--- a/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203025_in_product_marketing_email_verify_2_cta_clicked.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_verify_2_cta_clicked
 name: "count_clicks_on_the_third_email_of_the_verify_track_for_in_product_marketing_emails"
 description: Total clicks on the verify track's third email
diff --git a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
index e9e9a82cd02..4525ee77874 100644
--- a/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
+++ b/config/metrics/counts_all/20210510203035_in_product_marketing_email_trial_0_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_trial_0_sent
 name: "count_sent_first_email_of_the_trial_track_for_in_product_marketing_emails"
 description: Total sent emails of the trial track's first email
diff --git a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
index dec668f44f0..56d54929864 100644
--- a/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203044_in_product_marketing_email_trial_0_cta_clicked.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_trial_0_cta_clicked
 name: "count_clicks_on_the_first_email_of_the_trial_track_for_in_product_marketing_emails"
 description: Total clicks on the verify trial's first email
diff --git a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
index 09ca27a198b..9ee4363f83c 100644
--- a/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
+++ b/config/metrics/counts_all/20210510203054_in_product_marketing_email_trial_1_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_trial_1_sent
 name: "count_sent_second_email_of_the_trial_track_for_in_product_marketing_emails"
 description: Total sent emails of the trial track's second email
diff --git a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
index c706faef430..cd8b881e029 100644
--- a/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203104_in_product_marketing_email_trial_1_cta_clicked.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_trial_1_cta_clicked
 name: "count_clicks_on_the_second_email_of_the_trial_track_for_in_product_marketing_emails"
 description: Total clicks on the trial track's second email
diff --git a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
index 5708ba432b5..c1f6a7da94c 100644
--- a/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
+++ b/config/metrics/counts_all/20210510203114_in_product_marketing_email_trial_2_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_trial_2_sent
 name: "count_sent_third_email_of_the_trial_track_for_in_product_marketing_emails"
 description: Total sent emails of the trial track's third email
diff --git a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
index ff1ec072ceb..c46dd95d8dc 100644
--- a/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203124_in_product_marketing_email_trial_2_cta_clicked.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_trial_2_cta_clicked
 name: "count_clicks_on_the_third_email_of_the_trial_track_for_in_product_marketing_emails"
 description: Total clicks on the trial track's third email
diff --git a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
index 8337c962466..6cd44c2475f 100644
--- a/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
+++ b/config/metrics/counts_all/20210510203134_in_product_marketing_email_team_0_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_team_0_sent
 name: "count_sent_first_email_of_the_trial_team_for_in_product_marketing_emails"
 description: Total sent emails of the team track's first email
diff --git a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
index 182b1b5f0d7..020ec65966b 100644
--- a/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203143_in_product_marketing_email_team_0_cta_clicked.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_team_0_cta_clicked
 name: "count_clicks_on_the_first_email_of_the_team_track_for_in_product_marketing_emails"
 description: Total clicks on the team track's first email
diff --git a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
index aeaa6e43f50..8a0df5a4b9f 100644
--- a/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
+++ b/config/metrics/counts_all/20210510203153_in_product_marketing_email_team_1_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_team_1_sent
 name: "count_sent_second_email_of_the_team_track_for_in_product_marketing_emails"
 description: Total sent emails of the team track's second email
diff --git a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
index a1ebe731315..210bad95a55 100644
--- a/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203203_in_product_marketing_email_team_1_cta_clicked.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_team_1_cta_clicked
 name: "count_clicks_on_the_second_email_of_the_team_track_for_in_product_marketing_emails"
 description: Total clicks on the team track's second email
diff --git a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
index 9d9cdfb0577..3e3e680d45a 100644
--- a/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
+++ b/config/metrics/counts_all/20210510203213_in_product_marketing_email_team_2_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_team_2_sent
 name: "count_sent_third_email_of_the_team_track_for_in_product_marketing_emails"
 description: Total sent emails of the team track's third email
diff --git a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
index ffe99a1d4c3..9967091db09 100644
--- a/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
+++ b/config/metrics/counts_all/20210510203223_in_product_marketing_email_team_2_cta_clicked.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_team_2_cta_clicked
 name: "count_clicks_on_the_third_email_of_the_team_track_for_in_product_marketing_emails"
 description: Total clicks on the team track's third email
diff --git a/config/metrics/counts_all/20210514141520_project_imports_total.yml b/config/metrics/counts_all/20210514141520_project_imports_total.yml
index 2f61cfa9376..be421a6b577 100644
--- a/config/metrics/counts_all/20210514141520_project_imports_total.yml
+++ b/config/metrics/counts_all/20210514141520_project_imports_total.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: usage_activity_by_stage.manage.project_imports.total
 description: 'Count number of projects imported monthly'
 product_section: dev
diff --git a/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
index cbebbdc4eb0..c24a713711c 100644
--- a/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
+++ b/config/metrics/counts_all/20210517073546_package_events_i_package_helm_pull_package.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.package_events_i_package_helm_pull_package
 description: Total count of pull Helm packages events
 product_section: ops
diff --git a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
index d85eeefe9e6..17b3cbb7cda 100644
--- a/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
+++ b/config/metrics/counts_all/20210518081225_in_product_marketing_email_experience_0_sent.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: counts.in_product_marketing_email_experience_0_sent
 name: "count_sent_first_email_of_the_experience_track_for_in_product_marketing_emails"
 description: Total sent emails of the experience track's first email
diff --git a/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml b/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
index e405692bd87..0b1af1bf6d4 100644
--- a/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
+++ b/config/metrics/counts_all/20210625095025_package_events_i_package_helm_push_package.yml
@@ -11,7 +11,7 @@ milestone: "14.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64814
 time_frame: all
 data_source: redis
-data_category: Optional
+data_category: optional
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml b/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
index b2d39e70fe7..f61a1066759 100644
--- a/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
+++ b/config/metrics/counts_all/20210709191135_package_events_i_package_nuget_pull_symbol_package.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
 time_frame: all
 data_source: redis
-data_category: Optional
+data_category: optional
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml b/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
index a3c68b2d115..e220f54dadd 100644
--- a/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
+++ b/config/metrics/counts_all/20210709191829_package_events_i_package_nuget_push_symbol_package.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
 time_frame: all
 data_source: redis
-data_category: Optional
+data_category: optional
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml b/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
index 9a0abf74ba2..825b86958bf 100644
--- a/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
+++ b/config/metrics/counts_all/20210709210941_package_events_i_package_pull_symbol_package.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
 time_frame: all
 data_source: redis
-data_category: Optional
+data_category: optional
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml b/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
index 83117bd3047..b31f9e42aa2 100644
--- a/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210709211058_package_events_i_package_pull_symbol_package_by_deploy_token.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
 time_frame: all
 data_source: redis
-data_category: Optional
+data_category: optional
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml b/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
index 69b48c6f469..4a40a793d41 100644
--- a/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
+++ b/config/metrics/counts_all/20210709211248_package_events_i_package_pull_symbol_package_by_guest.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
 time_frame: all
 data_source: redis
-data_category: Optional
+data_category: optional
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml b/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
index 08cae05ba79..44eb3efe429 100644
--- a/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
+++ b/config/metrics/counts_all/20210709211341_package_events_i_package_pull_symbol_package_by_user.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
 time_frame: all
 data_source: redis
-data_category: Optional
+data_category: optional
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml b/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
index 191beea4742..5e4114c1e34 100644
--- a/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
+++ b/config/metrics/counts_all/20210709211439_package_events_i_package_push_symbol_package.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
 time_frame: all
 data_source: redis
-data_category: Optional
+data_category: optional
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml b/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
index 86b1ad50ace..b6da6dfb60b 100644
--- a/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210709211636_package_events_i_package_push_symbol_package_by_deploy_token.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
 time_frame: all
 data_source: redis
-data_category: Optional
+data_category: optional
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml b/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
index 268376a3912..26a4c1cb2cd 100644
--- a/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
+++ b/config/metrics/counts_all/20210709211731_package_events_i_package_push_symbol_package_by_guest.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
 time_frame: all
 data_source: redis
-data_category: Optional
+data_category: optional
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml b/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
index 75e6d8cfa55..aff7e4a5f8d 100644
--- a/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
+++ b/config/metrics/counts_all/20210709211831_package_events_i_package_push_symbol_package_by_user.yml
@@ -12,7 +12,7 @@ milestone: "14.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64554
 time_frame: all
 data_source: redis
-data_category: Optional
+data_category: optional
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210723075525_diff_searches.yml b/config/metrics/counts_all/20210723075525_diff_searches.yml
new file mode 100644
index 00000000000..02bb3c7ff67
--- /dev/null
+++ b/config/metrics/counts_all/20210723075525_diff_searches.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts.diff_searches
+description: Total count of merge request diff searches
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '14.2'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66522
+time_frame: all
+data_source: redis
+data_category: optional
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
new file mode 100644
index 00000000000..c720bf1556a
--- /dev/null
+++ b/config/metrics/counts_all/20210727095918_in_product_marketing_email_team_short_0_cta_clicked.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.in_product_marketing_email_team_short_0_cta_clicked
+name: "count_clicks_on_the_first_email_of_the_team_short_track_for_in_product_marketing_emails"
+description: Total clicks on the team_short track's first email
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66854
+time_frame: all
+data_source: database
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
new file mode 100644
index 00000000000..7c63172990f
--- /dev/null
+++ b/config/metrics/counts_all/20210727095923_in_product_marketing_email_team_short_0_sent.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.in_product_marketing_email_team_short_0_sent
+name: "count_sent_first_email_of_the_team_short_track_for_in_product_marketing_emails"
+description: Total sent emails of the team_short track's first email
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66854
+time_frame: all
+data_source: database
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
new file mode 100644
index 00000000000..0761627c548
--- /dev/null
+++ b/config/metrics/counts_all/20210727170553_in_product_marketing_email_trial_short_0_cta_clicked.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.in_product_marketing_email_trial_short_0_cta_clicked
+name: "count_clicks_on_the_first_email_of_the_trial_short_track_for_in_product_marketing_emails"
+description: Total clicks on the trial_short track's first email
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66943
+time_frame: all
+data_source: database
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
new file mode 100644
index 00000000000..e18ab01b4a5
--- /dev/null
+++ b/config/metrics/counts_all/20210727170558_in_product_marketing_email_trial_short_0_sent.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.in_product_marketing_email_trial_short_0_sent
+name: "count_sent_first_email_of_the_trial_short_track_for_in_product_marketing_emails"
+description: Total sent emails of the trial_short track's first email
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66943
+time_frame: all
+data_source: database
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
new file mode 100644
index 00000000000..aa1ce32f7c8
--- /dev/null
+++ b/config/metrics/counts_all/20210729140021_in_product_marketing_email_admin_verify_0_cta_clicked.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.in_product_marketing_email_admin_verify_0_cta_clicked
+name: "count_clicks_on_the_first_email_of_the_admin_verify_track_for_in_product_marketing_emails"
+description: Total clicks on the admin_verify track's first email
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67147
+time_frame: all
+data_source: database
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
new file mode 100644
index 00000000000..6cc374030d1
--- /dev/null
+++ b/config/metrics/counts_all/20210729140423_in_product_marketing_email_admin_verify_0_sent.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.in_product_marketing_email_admin_verify_0_sent
+name: "count_sent_first_email_of_the_admin_verify_track_for_in_product_marketing_emails"
+description: Total sent emails of the admin_verify track's first email
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category: onboarding
+value_type: number
+status: implemented
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67147
+time_frame: all
+data_source: database
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/license/20210201124932_recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml
index 7a40498abea..3b80163a05e 100644
--- a/config/metrics/license/20210201124932_recorded_at.yml
+++ b/config/metrics/license/20210201124932_recorded_at.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Standard
+data_category: standard
 key_path: recorded_at
 description: When the Usage Ping computation was started
 product_section: growth
@@ -19,3 +19,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/license/20210201124933_uuid.yml b/config/metrics/license/20210201124933_uuid.yml
index aab2b3a641c..a9503adf6c9 100644
--- a/config/metrics/license/20210201124933_uuid.yml
+++ b/config/metrics/license/20210201124933_uuid.yml
@@ -11,7 +11,7 @@ milestone: "9.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
 time_frame: none
 data_source: database
-data_category: Standard
+data_category: standard
 instrumentation_class: UuidMetric
 distribution:
 - ee
@@ -20,3 +20,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml
index 27669c3f6c5..36e57ee6e1d 100644
--- a/config/metrics/license/20210204124827_hostname.yml
+++ b/config/metrics/license/20210204124827_hostname.yml
@@ -9,7 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: system
-data_category: Standard
+data_category: standard
 instrumentation_class: HostnameMetric
 distribution:
 - ce
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml
index 2fa311f119d..f8beb5dfd0e 100644
--- a/config/metrics/license/20210204124829_active_user_count.yml
+++ b/config/metrics/license/20210204124829_active_user_count.yml
@@ -7,7 +7,7 @@ product_group: group::product intelligence
 product_category: collection
 value_type: string
 status: data_available
-data_category: Subscription
+data_category: subscription
 time_frame: none
 data_source: database
 distribution:
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
+performance_indicator_type: []
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
index 8323f5ea760..09b9f978519 100644
--- a/config/metrics/license/20210204124928_version.yml
+++ b/config/metrics/license/20210204124928_version.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: gitaly.version
 description: Version of Gitaly
 product_section: growth
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/license/20210204124936_version.yml b/config/metrics/license/20210204124936_pages_version.yml
index 2fe130ff780..72960ef07a0 100644
--- a/config/metrics/license/20210204124936_version.yml
+++ b/config/metrics/license/20210204124936_pages_version.yml
@@ -1,17 +1,20 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: gitlab_pages.version
 description: The version number of GitLab Pages
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category: pages
 value_type: string
 status: data_available
 time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
index 532a7861e46..07687856974 100644
--- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Standard
+data_category: standard
 key_path: recording_ce_finished_at
 description: When the core features were computed
 product_section: growth
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/license/20210216175601_version.yml b/config/metrics/license/20210216175601_version.yml
index a3de7da331f..acc83f0b693 100644
--- a/config/metrics/license/20210216175601_version.yml
+++ b/config/metrics/license/20210216175601_version.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: standard
 key_path: version
 description: Version of GitLab instance
 product_section: enablement
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/license/20210216175602_installation_type.yml b/config/metrics/license/20210216175602_installation_type.yml
index 669f983a505..2c838549beb 100644
--- a/config/metrics/license/20210216175602_installation_type.yml
+++ b/config/metrics/license/20210216175602_installation_type.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: installation_type
 description: The installation method used to install GitLab (Omnibus, Helm, etc)
 product_section: enablement
@@ -17,4 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/license/20210216181053_version.yml b/config/metrics/license/20210216181053_version.yml
index a95dcd5c13f..f4c0c9fa794 100644
--- a/config/metrics/license/20210216181053_version.yml
+++ b/config/metrics/license/20210216181053_version.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: container_registry_server.version
 description: Identifies the version of the external registry being used
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index 33dc3c38a9c..1f2a221e456 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: git.version
 description: Information about Git version
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/objects_schemas/collected_data_categories_schema.json b/config/metrics/objects_schemas/collected_data_categories_schema.json
index c1ff96d3953..80ccc7a3a3c 100644
--- a/config/metrics/objects_schemas/collected_data_categories_schema.json
+++ b/config/metrics/objects_schemas/collected_data_categories_schema.json
@@ -2,6 +2,6 @@
   "type": "array",
   "items": {
     "type": ["string", "null"],
-    "enum": ["Standard", "Subscription", "Operational", "Optional"]
+    "enum": ["standard", "subscription", "operational", "optional"]
   }
 }
diff --git a/config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json b/config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json
index 63a74061d91..1b38b110e9a 100644
--- a/config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json
+++ b/config/metrics/objects_schemas/projects_with_enabled_alert_integrations_histogram.json
@@ -1,6 +1,6 @@
 {
   "type": "object",
-  "description": "Histogram (buckets 1 to 100) of projects with at least 1 enabled integration"
+  "description": "Histogram (buckets 1 to 100) of projects with at least 1 enabled integration",
   "propertyNames": {
     "pattern": "^[1-9][0-9]?0?$"
   }
diff --git a/config/metrics/objects_schemas/topology_schema.json b/config/metrics/objects_schemas/topology_schema.json
index 013c9496069..e94c67ef55e 100644
--- a/config/metrics/objects_schemas/topology_schema.json
+++ b/config/metrics/objects_schemas/topology_schema.json
@@ -1,8 +1,8 @@
 {
   "type": "object",
-  "required": ["duration", "failures"],
+  "required": ["duration_s", "failures"],
   "properties": {
-    "duration": { "type": "number", "description": "The time it took to collect topology data" },
+    "duration_s": { "type": "number", "description": "The time it took to collect topology data" },
     "failures": { "type": "array", "description": "The information about failed queries" },
     "application_requests_per_hour": { "type": "number", "description": "The number of requests to the web application per hour" },
     "nodes": {
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index 0ce5a163184..24ea41d3f16 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -59,7 +59,7 @@
     },
     "data_category": {
       "type": "string",
-      "enum": ["Operational", "Optional", "Subscription", "Standard"]
+      "enum": ["Operational", "Optional", "Subscription", "Standard", "operational", "optional", "subscription", "standard"]
     },
     "instrumentation_class": {
       "type": "string",
@@ -72,6 +72,13 @@
         "enum": ["ee", "ce"]
       }
     },
+    "performance_indicator_type": {
+      "type": "array",
+      "items": {
+        "type": "string",
+        "enum": ["gmau", "smau", "paid_gmau", "umau"]
+      }
+    },
     "tier": {
       "type": "array",
       "items": {
diff --git a/config/metrics/settings/20210201124935_database_adapter.yml b/config/metrics/settings/20210201124935_database_adapter.yml
index 0a26d0afb68..38cdba2a071 100644
--- a/config/metrics/settings/20210201124935_database_adapter.yml
+++ b/config/metrics/settings/20210201124935_database_adapter.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: database.adapter
 description: This metric only returns a value of PostgreSQL in supported versions of GitLab. It could be removed from the usage ping. Historically MySQL was also supported.
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index f1426cd220d..8d635cc17a0 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: instance_auto_devops_enabled
 description: Whether auto DevOps is enabled
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index 4f5d2fde9e7..a780b8cfaa9 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: container_registry_enabled
 description: A count of projects where the container registry is enabled
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index a567dd3bf51..d92a3d9b5f9 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: dependency_proxy_enabled
 description: A count of projects where the dependency proxy is enabled
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index d1737989b80..552b0467518 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: gitlab_shared_runners_enabled
 description: Whether shared runners is enabled
 product_section: ops
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index aa7d697acfd..541c7be16e7 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: gravatar_enabled
 description: Whether gravatar is enabled
 product_section: dev
@@ -17,4 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index d1dcdaec106..cabbac5619e 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: ldap_enabled
 description: Whether LDAP is enabled
 product_section: growth
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index ed72e557ad7..0cefe4b595f 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: mattermost_enabled
 description: Whether Mattermost is enabled
 product_section: dev
-product_stage: create
-product_group: group::ecosystem
+product_stage: ecosystem
+product_group: group::integrations
 product_category: integrations
 value_type: boolean
 status: data_available
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 2943913bcbb..6451a66c87e 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: omniauth_enabled
 description: Whether OmniAuth is enabled
 product_section: growth
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
index bf33f8e4454..9002751cf6a 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: prometheus_enabled
 description: Whether the bundled Prometheus is enabled
 product_section: growth
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index df4a4f1edaa..04fc99f8dc5 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: prometheus_metrics_enabled
 description: Whether Prometheus Metrics endpoint is enabled
 product_section: growth
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index 35f834511b2..4d4de2da28a 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: reply_by_email_enabled
 description: Whether incoming email is setup
 product_section: dev
@@ -11,9 +11,10 @@ status: data_available
 time_frame: none
 data_source: system
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index 40b16f33b0b..059a3ecba7f 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: signup_enabled
 description: Whether public signup is enabled
 product_section: dev
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
index 869f7c89483..f972622d176 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: web_ide_clientside_preview_enabled
 description: Whether Web IDE clientside preview is enabled
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
index 9660614bd46..78225329763 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: grafana_link_enabled
 description: Whether Grafana is enabled
 product_section: growth
@@ -14,3 +14,4 @@ distribution:
 - ce
 tier:
 - free
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210204124934_enabled.yml b/config/metrics/settings/20210204124934_pages_enabled.yml
index 24ba7606e08..7c830e56787 100644
--- a/config/metrics/settings/20210204124934_enabled.yml
+++ b/config/metrics/settings/20210204124934_pages_enabled.yml
@@ -1,10 +1,10 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: gitlab_pages.enabled
 description: Whether GitLab Pages is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: ops
+product_stage: release
+product_group: group::release
 product_category: collection
 value_type: boolean
 status: data_available
@@ -12,6 +12,9 @@ time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
index 1b264834821..f82fddbc86c 100644
--- a/config/metrics/settings/20210216174829_smtp_server.yml
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: mail.smtp_server
 description: The value of the SMTP server that is used
 product_section: growth
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index 603064a301d..d92815bebfd 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Operational
+data_category: operational
 key_path: ingress_modsecurity_enabled
 description: Whether or not ModSecurity is enabled within Ingress
 product_section: sec
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216175604_edition.yml b/config/metrics/settings/20210216175604_edition.yml
index 6d5843b35f2..c85378304cc 100644
--- a/config/metrics/settings/20210216175604_edition.yml
+++ b/config/metrics/settings/20210216175604_edition.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: standard
 key_path: edition
 description: Edition of GitLab such as EE or CE
 product_section: enablement
@@ -17,4 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
index 2cd0949c9f5..fb0d3163b3e 100644
--- a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: settings.ldap_encrypted_secrets_enabled
 description: Is encrypted LDAP secrets configured?
 product_section: enablement
@@ -17,4 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216175609_version.yml b/config/metrics/settings/20210216175609_version.yml
index 468a8998637..1a8f7af4742 100644
--- a/config/metrics/settings/20210216175609_version.yml
+++ b/config/metrics/settings/20210216175609_version.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: database.version
 description: The version of the PostgreSQL database.
 product_section: enablement
@@ -17,4 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index 71ceb75ab84..1ade7ee7186 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: gitpod_enabled
 description: Whether Gitpod is enabled in the instance
 product_section: dev
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index 9a52788d2e3..f4f8f721ad1 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.artifacts.enabled
 description: Whether Object Storage is enabled for Artifacts
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index 1e8c0bf8d30..03f4f52aaf9 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.artifacts.object_store.enabled
 description: Whether Object Storage is enabled for Artifacts
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
index a0859d7d5a6..b8b85af94f9 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.artifacts.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for Artifacts
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
index 9386a1a8301..d354ad6ff49 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.artifacts.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for Artifacts
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
index 2c9e074f9ef..8b94a67dba7 100644
--- a/config/metrics/settings/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.artifacts.object_store.provider
 description: What Object Storage provider has been configured for Artifacts
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index a9c33827861..a40aadf701a 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.external_diffs.enabled
 description: Whether Object Storage is enabled for External Diffs
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index ca404dc8b66..b1adeac5238 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.external_diffs.object_store.enabled
 description: Whether Object Storage is enabled for External Diffs
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
index 37e77067336..a25637270e7 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.external_diffs.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for External Diffs
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
index 5c231d544bf..1326c2ebef4 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.external_diffs.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for External
   Diffs
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
index 8675e023caf..e057a6384a2 100644
--- a/config/metrics/settings/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.external_diffs.object_store.provider
 description: What Object Storage provider has been configured for External Diffs
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index 51aebd0f029..c129bb028d5 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.lfs.enabled
 description: Whether Object Storage is enabled for LFS
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index 842a6042ae6..bd26d91a2fa 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.lfs.object_store.enabled
 description: Whether Object Storage is enabled for LFS
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
index c2d680102e6..281b6744d35 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.lfs.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for LFS
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
index 9d4b16ba441..2e39fa7e379 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.lfs.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for LFS
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
index 1ec1949ef11..a8d265f9676 100644
--- a/config/metrics/settings/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.lfs.object_store.provider
 description: What Object Storage provider has been configured for LFS
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
index 7ebcbd04837..00e52b86d86 100644
--- a/config/metrics/settings/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.uploads.enabled
 description: Whether Object Storage is enabled for Uploads
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index f967861ae0b..dba464bfed3 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.uploads.object_store.enabled
 description: Whether Object Storage is enabled for Uploads
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
index ca8cfa003c3..93b69a728bc 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.uploads.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for Uploads
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
index 783baa1f30d..1af3d227f2f 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.uploads.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for Uploads
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
index 4066f83afdb..f9f98da3569 100644
--- a/config/metrics/settings/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.uploads.object_store.provider
 description: What Object Storage provider has been configured for Uploads
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index e19001746d8..436e5f717c1 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.packages.enabled
 description: Whether Object Storage is enabled for Uploads
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index 0cb84815e26..b52d85ef8df 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.packages.object_store.enabled
 description: Whether Object Storage is enabled for Packages
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
index 41adb02d6c6..058531516d7 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.packages.object_store.direct_upload
 description: Whether Direct Upload for Object Storage is enabled for Packages
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
index 9c5ded4f956..c03e600b622 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.packages.object_store.background_upload
 description: Whether Background Upload for Object Storage is enabled for Packages
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
index da5d1dc0c1b..bda2c485e3a 100644
--- a/config/metrics/settings/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: object_store.packages.object_store.provider
 description: What Object Storage provider has been configured for Packages
 product_section: enablement
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216183241_filesystems.yml b/config/metrics/settings/20210216183241_filesystems.yml
index 242f2818ac6..85f2a736756 100644
--- a/config/metrics/settings/20210216183241_filesystems.yml
+++ b/config/metrics/settings/20210216183241_filesystems.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: gitaly.filesystems
 description: ''
 product_section: ''
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210216183248_pg_system_id.yml b/config/metrics/settings/20210216183248_pg_system_id.yml
index 19b920ea7e3..5883473a003 100644
--- a/config/metrics/settings/20210216183248_pg_system_id.yml
+++ b/config/metrics/settings/20210216183248_pg_system_id.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: database.pg_system_id
 description: TBD
 product_section: enablement
 product_stage: enablement
 product_group: group::distribution
-product_category:
+product_category: 
 value_type: number
 status: data_available
 time_frame: all
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210225045628_operating_system.yml b/config/metrics/settings/20210225045628_operating_system.yml
index 6f1cd9be724..670babcef44 100644
--- a/config/metrics/settings/20210225045628_operating_system.yml
+++ b/config/metrics/settings/20210225045628_operating_system.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: settings.operating_system
 description: Information about the operating system running GitLab
 product_section: enablement
@@ -19,3 +19,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210321224827_gitaly_apdex.yml b/config/metrics/settings/20210321224827_gitaly_apdex.yml
index f760abae6dc..92d80129412 100644
--- a/config/metrics/settings/20210321224827_gitaly_apdex.yml
+++ b/config/metrics/settings/20210321224827_gitaly_apdex.yml
@@ -1,5 +1,5 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: settings.gitaly_apdex
 description: Gitaly application performance
 product_section: dev
@@ -19,3 +19,4 @@ tier:
 - free
 - premium
 - ultimate
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210323120839_topology.yml b/config/metrics/settings/20210323120839_topology.yml
index c998b37d039..934dc4dd6ce 100644
--- a/config/metrics/settings/20210323120839_topology.yml
+++ b/config/metrics/settings/20210323120839_topology.yml
@@ -1,11 +1,11 @@
 ---
-data_category: Optional
+data_category: optional
 key_path: topology
 description: Topology data
 product_section: enablement
 product_stage: enablement
 product_group: group::memory
-product_category:
+product_category: 
 value_type: object
 status: data_available
 milestone: "13.11"
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 value_json_schema: 'config/metrics/objects_schemas/topology_schema.json'
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210702140138_collected_data_categories.yml b/config/metrics/settings/20210702140138_collected_data_categories.yml
index dca7e1737db..65ae674d502 100644
--- a/config/metrics/settings/20210702140138_collected_data_categories.yml
+++ b/config/metrics/settings/20210702140138_collected_data_categories.yml
@@ -12,7 +12,8 @@ milestone: "14.1"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65336
 time_frame: none
 data_source: system
-data_category: Standard
+data_category: standard
+instrumentation_class: CollectedDataCategoriesMetric
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 value_json_schema: 'config/metrics/objects_schemas/collected_data_categories_schema.json'
+performance_indicator_type: []
diff --git a/config/metrics/settings/20210812202137_smtp_encrypted_secrets_enabled.yml b/config/metrics/settings/20210812202137_smtp_encrypted_secrets_enabled.yml
new file mode 100644
index 00000000000..ea6d92793de
--- /dev/null
+++ b/config/metrics/settings/20210812202137_smtp_encrypted_secrets_enabled.yml
@@ -0,0 +1,20 @@
+---
+key_path: settings.smtp_encrypted_secrets_enabled
+description: Is encrypted SMTP secrets configured?
+product_section: enablement
+product_stage: enablement
+product_group: distribution
+value_type: boolean
+status: implemented
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67802
+time_frame: none
+data_source: system
+data_category: Optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/puma.rb.example b/config/puma.rb.example
index f659529f23f..c70baf6570e 100644
--- a/config/puma.rb.example
+++ b/config/puma.rb.example
@@ -82,3 +82,12 @@ json_formatter = Gitlab::PumaLogging::JSONFormatter.new
 log_formatter do |str|
   json_formatter.call(str)
 end
+
+lowlevel_error_handler do |ex, env|
+  if Raven.configuration.capture_allowed?
+    Raven.capture_exception(ex, tags: { 'handler': 'puma_low_level' }, extra: { puma_env: env })
+  end
+
+  # note the below is just a Rack response
+  [500, {}, ["An error has occurred and reported in the system's low-level error handler."]]
+end
diff --git a/config/routes.rb b/config/routes.rb
index c1cb5a2a26f..9fdd2a70417 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -67,7 +67,6 @@ Rails.application.routes.draw do
 
     Gitlab.ee do
       resources :groups, only: [:new, :create]
-      resources :group_invites, only: [:new, :create]
       resources :projects, only: [:new, :create]
     end
   end
@@ -249,12 +248,6 @@ Rails.application.routes.draw do
           get :environments, format: :json
         end
 
-        scope :applications do
-          post '/:application', to: 'clusters/applications#create', as: :install_applications
-          patch '/:application', to: 'clusters/applications#update', as: :update_applications
-          delete '/:application', to: 'clusters/applications#destroy', as: :uninstall_applications
-        end
-
         get :metrics_dashboard
         get :'/prometheus/api/v1/*proxy_path', to: 'clusters#prometheus_proxy', as: :prometheus_api
         get :cluster_status, format: :json
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index ef8939bc5a9..d7f73354d4c 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -125,9 +125,9 @@ namespace :admin do
   end
 
   resource :application_settings, only: :update do
-    resources :services, only: [:index, :edit, :update]
     resources :integrations, only: [:edit, :update] do
       member do
+        get :overrides
         put :test
         post :reset
       end
diff --git a/config/routes/jira_connect.rb b/config/routes/jira_connect.rb
index 72b3f04f5e5..1a21d7a8778 100644
--- a/config/routes/jira_connect.rb
+++ b/config/routes/jira_connect.rb
@@ -13,4 +13,5 @@ namespace :jira_connect do
   end
 
   resources :subscriptions, only: [:index, :create, :destroy]
+  resources :branches, only: [:new]
 end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 65cdb8bba96..8ba9c100f71 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -283,7 +283,14 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
           resource :cycle_analytics, only: :show, path: 'value_stream_analytics'
           scope module: :cycle_analytics, as: 'cycle_analytics', path: 'value_stream_analytics' do
             resources :value_streams, only: [:index] do
-              resources :stages, only: [:index]
+              resources :stages, only: [:index] do
+                member do
+                  get :median
+                  get :average
+                  get :records
+                  get :count
+                end
+              end
             end
             resource :summary, controller: :summary, only: :show
           end
@@ -382,7 +389,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         namespace :design_management do
           namespace :designs, path: 'designs/:design_id(/:sha)', constraints: -> (params) { params[:sha].nil? || Gitlab::Git.commit_id?(params[:sha]) } do
             resource :raw_image, only: :show
-            resources :resized_image, only: :show, constraints: -> (params) { DesignManagement::DESIGN_IMAGE_SIZES.include?(params[:id]) }
+            resources :resized_image, only: :show, constraints: -> (params) { ::DesignManagement::DESIGN_IMAGE_SIZES.include?(params[:id]) }
           end
         end
 
diff --git a/config/settings.rb b/config/settings.rb
index 768ad9d284f..1860ea0f659 100644
--- a/config/settings.rb
+++ b/config/settings.rb
@@ -3,12 +3,6 @@
 require 'settingslogic'
 require 'digest/md5'
 
-# We can not use `Rails.root` here, as this file might be loaded without the
-# full Rails environment being loaded. We can not use `require_relative` either,
-# as Rails uses `load` for `require_dependency` (used when loading the Rails
-# environment). This could then lead to this file being loaded twice.
-require_dependency File.expand_path('../lib/gitlab', __dir__)
-
 class Settings < Settingslogic
   source ENV.fetch('GITLAB_CONFIG') { Pathname.new(File.expand_path('..', __dir__)).join('config/gitlab.yml') }
   namespace ENV.fetch('GITLAB_ENV') { Rails.env }
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 86835393238..52ecd62edd5 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -168,6 +168,8 @@
   - 1
 - - group_wikis_git_garbage_collect
   - 1
+- - groups_export_memberships
+  - 1
 - - groups_schedule_bulk_repository_shard_moves
   - 1
 - - groups_update_repository_storage
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 118aeac0ee1..b81b5611041 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -20,6 +20,7 @@ const WEBPACK_VERSION = require('webpack/package.json').version;
 
 const createIncrementalWebpackCompiler = require('./helpers/incremental_webpack_compiler');
 const IS_EE = require('./helpers/is_ee_env');
+const IS_JH = require('./helpers/is_jh_env');
 const vendorDllHash = require('./helpers/vendor_dll_hash');
 
 const MonacoWebpackPlugin = require('./plugins/monaco_webpack');
@@ -97,6 +98,14 @@ function generateEntries() {
     watchAutoEntries.push(path.join(ROOT_PATH, 'ee/app/assets/javascripts/pages/'));
   }
 
+  if (IS_JH) {
+    const eePageEntries = glob.sync('pages/**/index.js', {
+      cwd: path.join(ROOT_PATH, 'jh/app/assets/javascripts'),
+    });
+    eePageEntries.forEach((entryPath) => generateAutoEntries(entryPath, 'jh'));
+    watchAutoEntries.push(path.join(ROOT_PATH, 'jh/app/assets/javascripts/pages/'));
+  }
+
   const autoEntryKeys = Object.keys(autoEntriesMap);
   autoEntriesCount = autoEntryKeys.length;
 
@@ -126,7 +135,7 @@ function generateEntries() {
     default: defaultEntries,
     sentry: './sentry/index.js',
     performance_bar: './performance_bar/index.js',
-    jira_connect_app: './jira_connect/index.js',
+    jira_connect_app: './jira_connect/subscriptions/index.js',
   };
 
   return Object.assign(manualEntries, incrementalCompiler.filterEntryPoints(autoEntries));
@@ -168,6 +177,16 @@ if (IS_EE) {
   });
 }
 
+if (IS_JH) {
+  Object.assign(alias, {
+    jh: path.join(ROOT_PATH, 'jh/app/assets/javascripts'),
+    jh_icons: path.join(ROOT_PATH, 'jh/app/views/shared/icons'),
+    jh_images: path.join(ROOT_PATH, 'jh/app/assets/images'),
+    jh_spec: path.join(ROOT_PATH, 'jh/spec/javascripts'),
+    jh_jest: path.join(ROOT_PATH, 'jh/spec/frontend'),
+  });
+}
+
 if (!IS_PRODUCTION) {
   const fixtureDir = IS_EE ? 'fixtures-ee' : 'fixtures';