Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

40 files changed, 637 insertions, 13 deletions

diff --git a/config/metrics/aggregates/common.yml b/config/metrics/aggregates/common.yml
index 50d5122e806..0a9aec02b1a 100644
--- a/config/metrics/aggregates/common.yml
+++ b/config/metrics/aggregates/common.yml
@@ -62,3 +62,27 @@
     - 'i_testing_group_code_coverage_visit_total'
     - 'i_testing_load_performance_widget_total'
     - 'i_testing_metrics_report_widget_total'
+- name: xmau_plan
+  operator: OR
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - users_creating_work_items
+    - users_updating_work_item_title
+  feature_flag: track_work_items_activity
+- name: xmau_project_management
+  operator: OR
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - users_creating_work_items
+    - users_updating_work_item_title
+  feature_flag: track_work_items_activity
+- name: users_work_items
+  operator: OR
+  source: redis
+  time_frame: [7d, 28d]
+  events:
+    - users_creating_work_items
+    - users_updating_work_item_title
+  feature_flag: track_work_items_activity
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index 0c1523797c0..8664ee1bcc9 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index b13560ede4c..d21d70c8abb 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index 4d9b6b2cd9c..47bf8c9c821 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
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 5c4f21f3b3c..fe7fcb65895 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
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
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 d27548980b0..9d12339717d 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index 75129e5d824..bfc39e672ca 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index ee32c2baed9..3c0c401f38b 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -22,4 +22,5 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216175556_ci_triggers.yml b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
index 80842966536..c70a9337c6c 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -18,4 +18,5 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
diff --git a/config/metrics/counts_28d/20210216181937_failed_deployments.yml b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
index 9ef4157ce2d..78622151915 100644
--- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.release.failed_deployments
-description: Total failed deployments
+description: Disinct users who initiated a failed deployment.
 product_section: ops
 product_stage: release
 product_group: group::release
diff --git a/config/metrics/counts_28d/20210216181941_successful_deployments.yml b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
index f21cb609208..10c9de1817f 100644
--- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.release.successful_deployments
-description: Total successful deployments
+description: Disinct users who initiated a successful deployment.
 product_section: ops
 product_stage: release
 product_group: group::release
diff --git a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
index 4d676e436b2..eebce0dcb81 100644
--- a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
+++ b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
@@ -18,5 +18,6 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-milestone: "<13.9"
+milestone: "12.9"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26441"
 milestone_removed: "14.4"
diff --git a/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml b/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
new file mode 100644
index 00000000000..d33dd895022
--- /dev/null
+++ b/config/metrics/counts_28d/20220202160126_ci_users_executing_deployment_job_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_users.ci_users_executing_deployment_job_monthly
+description: Monthly counts of times users have executed deployment jobs
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category: continuous_delivery
+value_type: number
+status: active
+milestone: "14.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79272
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - ci_users_executing_deployment_job
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml b/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
new file mode 100644
index 00000000000..734bf674f00
--- /dev/null
+++ b/config/metrics/counts_28d/20220214202927_users_updating_work_item_title.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_title_monthly
+description: Unique users updating a work item's title
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80532
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_title
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml b/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
new file mode 100644
index 00000000000..30cd65425fe
--- /dev/null
+++ b/config/metrics/counts_28d/20220221210352_users_creating_work_items_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_creating_work_items_monthly
+description: Unique users creating work items
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81201
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_creating_work_items
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220222215951_xmau_plan.yml b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
new file mode 100644
index 00000000000..bab5f66eecd
--- /dev/null
+++ b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_monthly.aggregated_metrics.xmau_plan
+description: Unique users interacting with Plan features
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
new file mode 100644
index 00000000000..0f970f2a344
--- /dev/null
+++ b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_monthly.aggregated_metrics.xmau_project_management
+description: Unique users interacting with Project Management features
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220222215955_users_work_items.yml b/config/metrics/counts_28d/20220222215955_users_work_items.yml
new file mode 100644
index 00000000000..a0111383f1d
--- /dev/null
+++ b/config/metrics/counts_28d/20220222215955_users_work_items.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_monthly.aggregated_metrics.users_work_items
+description: Unique users interacting with work items
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::product planning
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml b/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml
new file mode 100644
index 00000000000..3a25e0a5a4b
--- /dev/null
+++ b/config/metrics/counts_28d/20220309183501_error_tracking_view_details_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.error_tracking.error_tracking_view_details_monthly
+description: Unique users viewing the error details page
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: error_tracking
+value_type: number
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - error_tracking_view_details
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml b/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml
new file mode 100644
index 00000000000..c94cca65514
--- /dev/null
+++ b/config/metrics/counts_28d/20220309195504_error_tracking_view_list_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.error_tracking.error_tracking_view_list_monthly
+description: Unique users viewing the list of errors in the project
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: error_tracking
+value_type: number
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - error_tracking_view_list
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
new file mode 100644
index 00000000000..50a854eb455
--- /dev/null
+++ b/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.error_tracking.error_tracking_total_unique_counts_monthly
+description: Total unique users accessing error tracking routes
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: error_tracking
+value_type: number
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - error_tracking_view_list
+    - error_tracking_view_details
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml b/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
new file mode 100644
index 00000000000..ca5f67e0ac5
--- /dev/null
+++ b/config/metrics/counts_7d/20220202160120_ci_users_executing_deployment_job_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_users.ci_users_executing_deployment_job_weekly
+description: Weekly counts of times users have executed deployment jobs
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category: continuous_delivery
+value_type: number
+status: active
+milestone: "14.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79272
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - ci_users_executing_deployment_job
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
new file mode 100644
index 00000000000..92fb6dbd03d
--- /dev/null
+++ b/config/metrics/counts_7d/20220216204730_users_updating_work_item_title_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_title_weekly
+description: Unique users updating a work item's title
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80532
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_title
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
new file mode 100644
index 00000000000..0c7e18ec458
--- /dev/null
+++ b/config/metrics/counts_7d/20220221210026_users_creating_work_items_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_creating_work_items_weekly
+description: Unique users creating work items
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81201
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_creating_work_items
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220222215851_xmau_plan.yml b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
new file mode 100644
index 00000000000..cc393d6b0a5
--- /dev/null
+++ b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_weekly.aggregated_metrics.xmau_plan
+description: Unique users interacting with Plan features
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
new file mode 100644
index 00000000000..40eaf21889e
--- /dev/null
+++ b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_weekly.aggregated_metrics.xmau_project_management
+description: Unique users interacting with Project Management features
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::project management
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220222215855_users_work_items.yml b/config/metrics/counts_7d/20220222215855_users_work_items.yml
new file mode 100644
index 00000000000..fe77e885449
--- /dev/null
+++ b/config/metrics/counts_7d/20220222215855_users_work_items.yml
@@ -0,0 +1,21 @@
+---
+key_path: counts_weekly.aggregated_metrics.users_work_items
+description: Unique users interacting with work items
+product_category: team planning
+product_section: dev
+product_stage: plan
+product_group: group::product planning
+value_type: number
+status: active
+milestone: '14.9'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81336
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml b/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml
new file mode 100644
index 00000000000..bb487abef6d
--- /dev/null
+++ b/config/metrics/counts_7d/20220309183454_error_tracking_view_details_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.error_tracking.error_tracking_view_details_weekly
+description: Unique users viewing the error details page
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: error_tracking
+value_type: number
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - error_tracking_view_details
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml b/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml
new file mode 100644
index 00000000000..e75e6a20c81
--- /dev/null
+++ b/config/metrics/counts_7d/20220309195457_error_tracking_view_list_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.error_tracking.error_tracking_view_list_weekly
+description: Unique users viewing the list of errors in the project
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: error_tracking
+value_type: number
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - error_tracking_view_list
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
new file mode 100644
index 00000000000..851fd6d0925
--- /dev/null
+++ b/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.error_tracking.error_tracking_total_unique_counts_weekly
+description: Total unique users accessing error tracking routes
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: error_tracking
+value_type: number
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82543
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - error_tracking_view_list
+    - error_tracking_view_details
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210514141520_project_imports_total.yml b/config/metrics/counts_all/20210514141520_project_imports_total.yml
index 3846e3b9fc7..1c5a42c4892 100644
--- a/config/metrics/counts_all/20210514141520_project_imports_total.yml
+++ b/config/metrics/counts_all/20210514141520_project_imports_total.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.project_imports.total
-description: 'Count number of projects imported monthly'
+description: Number of projects imported
 product_section: dev
 product_stage: manage
 product_group: group::import
diff --git a/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
new file mode 100644
index 00000000000..0174f9a6222
--- /dev/null
+++ b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts.service_usage_data_download_payload_click
+description: Count Download Payload button clicks
+data_category: optional
+name: count_promoted_issues
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
+product_category: collection
+value_type: number
+status: active
+time_frame: all
+data_source: redis
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
+performance_indicator_type: []
+milestone: "14.9"
diff --git a/config/metrics/counts_all/20220315180122_projects_harbor_active.yml b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
new file mode 100644
index 00000000000..90bdad02b8b
--- /dev/null
+++ b/config/metrics/counts_all/20220315180122_projects_harbor_active.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: counts.projects_harbor_active
+description: Count of projects with active integrations for Harbor
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "14.9"
diff --git a/config/metrics/counts_all/20220315180124_groups_harbor_active.yml b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
new file mode 100644
index 00000000000..6fc8d9a8ec2
--- /dev/null
+++ b/config/metrics/counts_all/20220315180124_groups_harbor_active.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: counts.groups_harbor_active
+description: Count of groups with active integrations for Harbor
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "14.9"
diff --git a/config/metrics/counts_all/20220315180127_instances_harbor_active.yml b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
new file mode 100644
index 00000000000..a5621da5390
--- /dev/null
+++ b/config/metrics/counts_all/20220315180127_instances_harbor_active.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: counts.instances_harbor_active
+description: Count of active instance-level integrations for Harbor
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "14.9"
diff --git a/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
new file mode 100644
index 00000000000..97c31b331aa
--- /dev/null
+++ b/config/metrics/counts_all/20220315180129_projects_inheriting_harbor_active.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: counts.projects_inheriting_harbor_active
+description: Count of active projects inheriting integrations for Harbor
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "14.9"
diff --git a/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
new file mode 100644
index 00000000000..7091a87632f
--- /dev/null
+++ b/config/metrics/counts_all/20220315180131_groups_inheriting_harbor_active.yml
@@ -0,0 +1,21 @@
+---
+data_category: optional
+key_path: counts.groups_inheriting_harbor_active
+description: Count of active groups inheriting integrations for Harbor
+product_section: dev
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
+value_type: number
+status: active
+time_frame: all
+data_source: database
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "14.9"
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index 6517c3bc4f5..8d00f03f52b 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -6,7 +6,8 @@ product_section: enablement
 product_stage: enablement
 product_group: group::distribution
 product_category: ''
-value_type: string
+value_type: object
+value_json_schema: 'config/metrics/objects_schemas/git_version_schema.json'
 status: active
 milestone: "<13.9"
 time_frame: none
diff --git a/config/metrics/objects_schemas/git_version_schema.json b/config/metrics/objects_schemas/git_version_schema.json
new file mode 100644
index 00000000000..2489b05e188
--- /dev/null
+++ b/config/metrics/objects_schemas/git_version_schema.json
@@ -0,0 +1,9 @@
+{
+  "type": "object",
+  "required": ["major"],
+  "properties": {
+    "major": { "type": "number", "description": "Major version number" },
+    "minor": { "type": "number", "description": "Minor version number" },
+    "patch": { "type": "number", "description": "Patch number" }
+  }
+}
diff --git a/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
new file mode 100644
index 00000000000..6e17601e76d
--- /dev/null
+++ b/config/metrics/settings/20220222181654_certificate_based_clusters_ff.yml
@@ -0,0 +1,24 @@
+---
+key_path: settings.certificate_based_clusters_ff
+name: "certificate_based_clusters_ff"
+description: "Certificate-based clusters feature flag"
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category:
+value_type: boolean
+status: active
+milestone: "14.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81311
+time_frame: none
+data_source: database
+data_category: optional
+instrumentation_class: CertBasedClustersFfMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate