Add latest changes from gitlab-org/gitlab@master

40 files changed, 63 insertions, 361 deletions

diff --git a/config/feature_flags/development/lfs_integrity_inspect_quarantined_objects.yml b/config/feature_flags/development/lfs_integrity_inspect_quarantined_objects.yml
deleted file mode 100644
index f8b589c0a4f..00000000000
--- a/config/feature_flags/development/lfs_integrity_inspect_quarantined_objects.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: lfs_integrity_inspect_quarantined_objects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58634
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/327440
-milestone: '13.11'
-type: development
-group: group::gitaly
-default_enabled: false
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 d589814b7af..c5a0a2eebcd 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,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.analytics_unique_visits_for_any_target_monthly
-description: Visits to any of the pages listed above per month
+description: Unique visitors to any analytics feature by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml b/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
deleted file mode 100644
index ea3094527db..00000000000
--- a/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_contribution_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml b/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
deleted file mode 100644
index cb792aae308..00000000000
--- a/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_insights_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml b/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
deleted file mode 100644
index 9fc7894d399..00000000000
--- a/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_issues_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml b/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
deleted file mode 100644
index 2ae3c3626d1..00000000000
--- a/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_productivity_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml b/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
deleted file mode 100644
index 86d84193265..00000000000
--- a/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.g_analytics_valuestream_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
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 ba5c4d27d25..72a1f5a2faa 100644
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.p_analytics_pipelines_monthly
-description:
+description: Unique visitors to /groups/:group/-/analytics/ci_cd by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml b/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
deleted file mode 100644
index e4c15360b52..00000000000
--- a/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_code_reviews_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
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 da07cbee741..7bd0a5ae025 100644
--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -1,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.p_analytics_valuestream_monthly
-description:
+description: Unique visitors to /:group/:project/-/value_stream_analytics by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml b/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
deleted file mode 100644
index afe6c79e885..00000000000
--- a/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_insights_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml b/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
deleted file mode 100644
index 4ee8afd234b..00000000000
--- a/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_issues_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml b/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
deleted file mode 100644
index c41b84dbcd0..00000000000
--- a/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_repo_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
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 843d3717ba7..3ac2e608210 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.analytics.i_analytics_cohorts_monthly
 description:
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
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 77b6068fb8d..ae43df148e5 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,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.i_analytics_dev_ops_score_monthly
-description:
+description: Unique visitors to /admin/dev_ops_report by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
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 d7af387f862..b7567777135 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
@@ -3,7 +3,7 @@ key_path: redis_hll_counters.analytics.g_analytics_merge_request_monthly
 description:
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
@@ -13,4 +13,4 @@ distribution:
 - ce
 tier:
 - free
-skip_validation: true
+skip_validation: true
\ No newline at end of file
diff --git a/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
deleted file mode 100644
index f3f7da5ee38..00000000000
--- a/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: redis_hll_counters.analytics.p_analytics_merge_request_monthly
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-product_category:
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: redis_hll
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
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 d7071bf4a79..d9011ddf00b 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,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.i_analytics_instance_statistics_monthly
-description:
+description: Unique visitors to /admin/usage_trends by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
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 d173a922f5d..3ce4cbc6e95 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,9 +1,9 @@
 ---
 key_path: redis_hll_counters.analytics.analytics_total_unique_counts_monthly
-description:
+description: The number of unique users who visited any analytics feature by month
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
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
new file mode 100644
index 00000000000..d81d1e96966
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
@@ -0,0 +1,15 @@
+---
+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:
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+tier: []
+skip_validation: true
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
new file mode 100644
index 00000000000..63d2eee8f4c
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -0,0 +1,15 @@
+---
+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:
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+tier: []
+skip_validation: true
diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index 6885d8971d1..77baa673bb2 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -3,7 +3,7 @@ key_path: counts.cycle_analytics_views
 description:
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml b/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
deleted file mode 100644
index 03271ea0f13..00000000000
--- a/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: counts.productivity_analytics_views
-description:
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-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/20210216174836_g_analytics_contribution.yml b/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
deleted file mode 100644
index a56358e7d13..00000000000
--- a/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.g_analytics_contribution
-description: Visits to /groups/:group/-/contribution_analytics
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-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/20210216174838_g_analytics_insights.yml b/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
deleted file mode 100644
index 72197fa6f29..00000000000
--- a/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.g_analytics_insights
-description: Visits to /groups/:group/-/insights
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-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/20210216174840_g_analytics_issues.yml b/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
deleted file mode 100644
index dc042c141e3..00000000000
--- a/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.g_analytics_issues
-description: Visits to /groups/:group/-/issues_analytics
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-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/20210216174842_g_analytics_productivity.yml b/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
deleted file mode 100644
index eeab6200458..00000000000
--- a/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.g_analytics_productivity
-description: Visits to /groups/:group/-/analytics/productivity_analytics
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-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/20210216174844_g_analytics_valuestream.yml b/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
deleted file mode 100644
index 92399204faa..00000000000
--- a/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.g_analytics_valuestream
-description: Visits to /groups/:group/-/analytics/value_stream_analytics
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-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/20210216174846_p_analytics_pipelines.yml b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
index 8138873e882..3a263f167d6 100644
--- a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
+++ b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.p_analytics_pipelines
-description: Visits to /:group/:project/pipelines/charts
+description: Unique visitors to /:group/:project/pipelines/charts
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml b/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
deleted file mode 100644
index ac00c26a5ee..00000000000
--- a/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.p_analytics_code_reviews
-description: Visits to /:group/:project/-/analytics/code_reviews
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-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/20210216174850_p_analytics_valuestream.yml b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
index b2802ab9084..c33fb10c4cb 100644
--- a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
+++ b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.p_analytics_valuestream
-description: Visits to /:group/:project/-/value_stream_analytics
+description: Unique visitors to /:group/:project/-/value_stream_analytics
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216174852_p_analytics_insights.yml b/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
deleted file mode 100644
index 48c7e333b2c..00000000000
--- a/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.p_analytics_insights
-description: Visits to /:group/:project/insights
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-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/20210216174854_p_analytics_issues.yml b/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
deleted file mode 100644
index 86f7634ea32..00000000000
--- a/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.p_analytics_issues
-description: Visits to /:group/:project/-/analytics/issues_analytics
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-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/20210216174856_p_analytics_repo.yml b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
index 275cdd1e45b..1600feeb834 100644
--- a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
+++ b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.p_analytics_repo
-description: Visits to /:group/:project/-/graphs/master/charts
+description: Unique visitors to /:group/:project/-/graphs/master/charts
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
diff --git a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
index 14ff37dd4ad..2e5883b6fbf 100644
--- a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
+++ b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.i_analytics_cohorts
-description: Visits to /-/instance_statistics/cohorts
+description: Unique visitors to /-/instance_statistics/cohorts
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
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 586b9a15b70..7596572eaf1 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,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.i_analytics_dev_ops_score
-description: Visits to /-/instance_statistics/dev_ops_score
+description: Unique visitors to /-/instance_statistics/dev_ops_score
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
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 537a1c5dae8..fef77d5c3ac 100644
--- a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.g_analytics_merge_request
-description: Visits to /groups/:group/-/analytics/merge_request_analytics
+description: Unique visitors to /groups/:group/-/analytics/merge_request_analytics
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
@@ -13,4 +13,4 @@ distribution:
 - ce
 tier:
 - free
-skip_validation: true
+skip_validation: true
\ No newline at end of file
diff --git a/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml b/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
deleted file mode 100644
index f8d509c9130..00000000000
--- a/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-key_path: analytics_unique_visits.p_analytics_merge_request
-description: Visits to /:group/:project/-/analytics/merge_request_analytics
-product_section: dev
-product_stage: manage
-product_group: group::analytics
-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/20210216174906_i_analytics_instance_statistics.yml b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
index e834d6ae823..08e89517b8d 100644
--- a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
+++ b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
@@ -1,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.i_analytics_instance_statistics
-description: Visit to /admin/instance_statistics
+description: Unique visitors to/admin/usage_trends
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
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 d4d010ab419..cc0a21b1cb3 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,9 +1,9 @@
 ---
 key_path: analytics_unique_visits.analytics_unique_visits_for_any_target
-description: Visits to any of the pages listed above per week
+description: Unique visitors to any analytics feature by week
 product_section: dev
 product_stage: manage
-product_group: group::analytics
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available