Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

63 files changed, 1124 insertions, 2 deletions

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_7d/20210216175111_merge_request_action_weekly.yml b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
new file mode 100644
index 00000000000..aaf56f066f9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..726936cb49a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..928dd409445
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..9e1b3ae8dde
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..a81b1f82c3d
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_section: dev
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..4349c4111a8
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..30c2b4fb2e5
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..5867d24ad1a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..b659ed72265
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..7d9bdb2fe05
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..c00c652a27b
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..675ddb66f56
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..857a2cf17e9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..3c3cd7b6171
--- /dev/null
+++ b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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 f8c48ac20f9..362404036a5 100644
--- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -9,10 +9,11 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: CountUsersUsingApproveQuickActionMetric
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
diff --git a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
new file mode 100644
index 00000000000..e887858fe96
--- /dev/null
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
new file mode 100644
index 00000000000..37744671757
--- /dev/null
+++ b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.source_code.design_action_weekly
+description: Count of total design actions (upload, delete, comment, reply)
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
new file mode 100644
index 00000000000..6f6dc87783a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
new file mode 100644
index 00000000000..e14c0a39399
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
@@ -0,0 +1,18 @@
+---
+key_path: redis_hll_counters.source_code.git_write_action_weekly
+description: Count of unique Git write actions
+product_section: dev
+product_stage: create
+product_group: group::source code
+product_category: source_code_management
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..f97747932a5
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..e220ecfb3fa
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..07db3a24ab9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..faef58e57b7
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..83962fbbb76
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..2269498bea0
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..618fed87951
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..5c2e8f2a66c
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..4d686094bad
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..bf7f7549958
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..9fb4d36abc7
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..a149c7cc7a5
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..d376ac6501e
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..af747413f41
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..5a99e741a7d
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..8c946ccb418
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..0716e3b702a
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..f0a45edae21
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..f1abdb24875
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..76ab0f54c34
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: editor_extension
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..4e2a71a4593
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..9b4c6cb0318
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -0,0 +1,17 @@
+---
+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
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+ - free
+ - premium
+ - ultimate
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
new file mode 100644
index 00000000000..c6935a76319
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_stage: deploy
+product_group: "group::5-min-app"
+product_category: five_minute_production_app
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+
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
new file mode 100644
index 00000000000..d9007dc1f8d
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: release
+product_group: "group::release"
+product_category: continuous_delivery
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..f35cacdb4c9
--- /dev/null
+++ b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
@@ -0,0 +1,18 @@
+---
+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
+product_stage: release
+product_group: "group::release"
+product_category: continuous_delivery
+value_type: number
+status: data_available
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..7fedcc5f05d
--- /dev/null
+++ b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
@@ -0,0 +1,20 @@
+---
+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
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..49d8ad20126
--- /dev/null
+++ b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
@@ -0,0 +1,20 @@
+---
+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
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
+value_type: number
+status: implemented
+milestone: '13.11'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
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
new file mode 100644
index 00000000000..179d2fa6e47
--- /dev/null
+++ b/config/metrics/counts_7d/20210421144349_i_code_review_click_single_file_mode_setting_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
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
new file mode 100644
index 00000000000..50264bf27cf
--- /dev/null
+++ b/config/metrics/counts_7d/20210421145814_i_code_review_click_file_browser_setting_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
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
new file mode 100644
index 00000000000..3206bac8b49
--- /dev/null
+++ b/config/metrics/counts_7d/20210421145942_i_code_review_click_whitespace_setting_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
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
new file mode 100644
index 00000000000..7a3a606c886
--- /dev/null
+++ b/config/metrics/counts_7d/20210422101512_i_code_review_diff_view_inline_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
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
new file mode 100644
index 00000000000..36dbeae82e7
--- /dev/null
+++ b/config/metrics/counts_7d/20210422101609_i_code_review_diff_view_parallel_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
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
new file mode 100644
index 00000000000..ef74ff6613f
--- /dev/null
+++ b/config/metrics/counts_7d/20210422101750_i_code_review_file_browser_tree_view_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
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
new file mode 100644
index 00000000000..e2b9f141bb7
--- /dev/null
+++ b/config/metrics/counts_7d/20210422101849_i_code_review_file_browser_list_view_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
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
new file mode 100644
index 00000000000..6cca3840faa
--- /dev/null
+++ b/config/metrics/counts_7d/20210422101925_i_code_review_diff_show_whitespace_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
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
new file mode 100644
index 00000000000..c1fccc9f774
--- /dev/null
+++ b/config/metrics/counts_7d/20210422102007_i_code_review_diff_hide_whitespace_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
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
new file mode 100644
index 00000000000..3b1abf6e0e1
--- /dev/null
+++ b/config/metrics/counts_7d/20210422102118_i_code_review_diff_single_file_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
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
new file mode 100644
index 00000000000..b3105b041f8
--- /dev/null
+++ b/config/metrics/counts_7d/20210422102159_i_code_review_diff_multiple_files_weekly.yml
@@ -0,0 +1,19 @@
+---
+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
+product_stage: create
+product_group: group::code review
+product_category: code_review
+value_type: number
+status: implemented
+milestone: '13.12'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59979
+time_frame: 7d
+data_source: redis_hll
+distribution:
+  - ce
+tier:
+  - free
+  - premium
+  - ultimate
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
new file mode 100644
index 00000000000..31b36bc8ad7
--- /dev/null
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_weekly.aggregated_metrics.code_review_group_monthly_active_users
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 7d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
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
new file mode 100644
index 00000000000..aaf9350cdaa
--- /dev/null
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_weekly.aggregated_metrics.code_review_category_monthly_active_users
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 7d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
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
new file mode 100644
index 00000000000..ded67e19e10
--- /dev/null
+++ b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
@@ -0,0 +1,22 @@
+---
+key_path: counts_weekly.aggregated_metrics.code_review_extension_category_monthly_active_users
+name: ""
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 7d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true
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
new file mode 100644
index 00000000000..7f782d90f8d
--- /dev/null
+++ b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
@@ -0,0 +1,22 @@
+---
+key_path: redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_counts_weekly
+name: "0"
+description:
+product_section:
+product_stage:
+product_group:
+product_category:
+value_type: number
+status: implemented
+milestone: "13.12"
+introduced_by_url:
+time_frame: 7d
+data_source:
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+skip_validation: true