Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

31 files changed, 768 insertions, 66 deletions

diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index ab39318eb0d..60619deb786 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -13,62 +13,122 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-  - i_code_review_mr_diffs
-  - i_code_review_user_single_file_diffs
-  - i_code_review_mr_single_file_diffs
-  - i_code_review_user_toggled_task_item_status
-  - i_code_review_user_create_mr
-  - i_code_review_user_close_mr
-  - i_code_review_user_reopen_mr
-  - i_code_review_user_approve_mr
-  - i_code_review_user_unapprove_mr
-  - i_code_review_user_resolve_thread
-  - i_code_review_user_unresolve_thread
-  - i_code_review_edit_mr_title
-  - i_code_review_edit_mr_desc
-  - i_code_review_user_merge_mr
-  - i_code_review_user_create_mr_comment
-  - i_code_review_user_edit_mr_comment
-  - i_code_review_user_remove_mr_comment
-  - i_code_review_user_create_review_note
-  - i_code_review_user_publish_review
-  - i_code_review_user_create_multiline_mr_comment
-  - i_code_review_user_edit_multiline_mr_comment
-  - i_code_review_user_remove_multiline_mr_comment
-  - i_code_review_user_add_suggestion
-  - i_code_review_user_apply_suggestion
-  - i_code_review_user_assigned
-  - i_code_review_user_marked_as_draft
-  - i_code_review_user_unmarked_as_draft
-  - i_code_review_user_review_requested
-  - i_code_review_user_approval_rule_added
-  - i_code_review_user_approval_rule_deleted
-  - i_code_review_user_approval_rule_edited
-  - i_code_review_user_vs_code_api_request
-  - i_code_review_user_create_mr_from_issue
-  - i_code_review_user_mr_discussion_locked
-  - i_code_review_user_mr_discussion_unlocked
-  - i_code_review_user_time_estimate_changed
-  - i_code_review_user_time_spent_changed
-  - i_code_review_user_assignees_changed
-  - i_code_review_user_reviewers_changed
-  - i_code_review_user_milestone_changed
-  - i_code_review_user_labels_changed
-  - i_code_review_click_diff_view_setting
-  - i_code_review_click_single_file_mode_setting
-  - i_code_review_click_file_browser_setting
-  - i_code_review_click_whitespace_setting
-  - i_code_review_diff_view_inline
-  - i_code_review_diff_view_parallel
-  - i_code_review_file_browser_tree_view
-  - i_code_review_file_browser_list_view
-  - i_code_review_diff_show_whitespace
-  - i_code_review_diff_hide_whitespace
-  - i_code_review_diff_single_file
-  - i_code_review_diff_multiple_files
-  - i_code_review_user_load_conflict_ui
-  - i_code_review_user_resolve_conflict
-  - i_code_review_user_searches_diff
+    - i_code_review_click_diff_view_setting
+    - i_code_review_click_file_browser_setting
+    - i_code_review_click_single_file_mode_setting
+    - i_code_review_click_whitespace_setting
+    - i_code_review_create_note_in_ipynb_diff
+    - i_code_review_create_note_in_ipynb_diff_commit
+    - i_code_review_create_note_in_ipynb_diff_mr
+    - i_code_review_diff_hide_whitespace
+    - i_code_review_diff_multiple_files
+    - i_code_review_diff_show_whitespace
+    - i_code_review_diff_single_file
+    - i_code_review_diff_view_inline
+    - i_code_review_diff_view_parallel
+    - i_code_review_edit_mr_desc
+    - i_code_review_edit_mr_title
+    - i_code_review_file_browser_list_view
+    - i_code_review_file_browser_tree_view
+    - i_code_review_merge_request_widget_accessibility_expand
+    - i_code_review_merge_request_widget_accessibility_expand_failed
+    - i_code_review_merge_request_widget_accessibility_expand_success
+    - i_code_review_merge_request_widget_accessibility_expand_warning
+    - i_code_review_merge_request_widget_accessibility_full_report_clicked
+    - i_code_review_merge_request_widget_accessibility_view
+    - i_code_review_merge_request_widget_code_quality_expand
+    - i_code_review_merge_request_widget_code_quality_expand_failed
+    - i_code_review_merge_request_widget_code_quality_expand_success
+    - i_code_review_merge_request_widget_code_quality_expand_warning
+    - i_code_review_merge_request_widget_code_quality_full_report_clicked
+    - i_code_review_merge_request_widget_code_quality_view
+    - i_code_review_merge_request_widget_metrics_expand
+    - i_code_review_merge_request_widget_metrics_expand_failed
+    - i_code_review_merge_request_widget_metrics_expand_success
+    - i_code_review_merge_request_widget_metrics_expand_warning
+    - i_code_review_merge_request_widget_metrics_full_report_clicked
+    - i_code_review_merge_request_widget_metrics_view
+    - i_code_review_merge_request_widget_status_checks_expand
+    - i_code_review_merge_request_widget_status_checks_expand_failed
+    - i_code_review_merge_request_widget_status_checks_expand_success
+    - i_code_review_merge_request_widget_status_checks_expand_warning
+    - i_code_review_merge_request_widget_status_checks_full_report_clicked
+    - i_code_review_merge_request_widget_status_checks_view
+    - i_code_review_merge_request_widget_terraform_expand
+    - i_code_review_merge_request_widget_terraform_expand_failed
+    - i_code_review_merge_request_widget_terraform_expand_success
+    - i_code_review_merge_request_widget_terraform_expand_warning
+    - i_code_review_merge_request_widget_terraform_full_report_clicked
+    - i_code_review_merge_request_widget_terraform_view
+    - i_code_review_merge_request_widget_test_summary_expand
+    - i_code_review_merge_request_widget_test_summary_expand_failed
+    - i_code_review_merge_request_widget_test_summary_expand_success
+    - i_code_review_merge_request_widget_test_summary_expand_warning
+    - i_code_review_merge_request_widget_test_summary_full_report_clicked
+    - i_code_review_merge_request_widget_test_summary_view
+    - i_code_review_merge_request_widget_license_compliance_expand
+    - i_code_review_merge_request_widget_license_compliance_expand_failed
+    - i_code_review_merge_request_widget_license_compliance_expand_success
+    - i_code_review_merge_request_widget_license_compliance_warning
+    - i_code_review_merge_request_widget_license_compliance_full_report_clicked
+    - i_code_review_merge_request_widget_license_compliance_view
+    - i_code_review_mr_diffs
+    - i_code_review_mr_single_file_diffs
+    - i_code_review_mr_with_invalid_approvers
+    - i_code_review_post_merge_click_cherry_pick
+    - i_code_review_post_merge_click_revert
+    - i_code_review_post_merge_delete_branch
+    - i_code_review_post_merge_submit_cherry_pick_modal
+    - i_code_review_post_merge_submit_revert_modal
+    - i_code_review_total_suggestions_added
+    - i_code_review_total_suggestions_applied
+    - i_code_review_user_add_suggestion
+    - i_code_review_user_apply_suggestion
+    - i_code_review_user_approval_rule_added
+    - i_code_review_user_approval_rule_deleted
+    - i_code_review_user_approval_rule_edited
+    - i_code_review_user_approve_mr
+    - i_code_review_user_assigned
+    - i_code_review_user_assignees_changed
+    - i_code_review_user_close_mr
+    - i_code_review_user_create_mr
+    - i_code_review_user_create_mr_comment
+    - i_code_review_user_create_mr_from_issue
+    - i_code_review_user_create_multiline_mr_comment
+    - i_code_review_user_create_note_in_ipynb_diff
+    - i_code_review_user_create_note_in_ipynb_diff_commit
+    - i_code_review_user_create_note_in_ipynb_diff_mr
+    - i_code_review_user_create_review_note
+    - i_code_review_user_edit_mr_comment
+    - i_code_review_user_edit_multiline_mr_comment
+    - i_code_review_user_gitlab_cli_api_request
+    - i_code_review_user_jetbrains_api_request
+    - i_code_review_user_labels_changed
+    - i_code_review_user_load_conflict_ui
+    - i_code_review_user_marked_as_draft
+    - i_code_review_user_merge_mr
+    - i_code_review_user_milestone_changed
+    - i_code_review_user_mr_discussion_locked
+    - i_code_review_user_mr_discussion_unlocked
+    - i_code_review_user_publish_review
+    - i_code_review_user_remove_mr_comment
+    - i_code_review_user_remove_multiline_mr_comment
+    - i_code_review_user_reopen_mr
+    - i_code_review_user_resolve_conflict
+    - i_code_review_user_resolve_thread
+    - i_code_review_user_resolve_thread_in_issue
+    - i_code_review_user_review_requested
+    - i_code_review_user_reviewers_changed
+    - i_code_review_user_searches_diff
+    - i_code_review_user_single_file_diffs
+    - i_code_review_user_time_estimate_changed
+    - i_code_review_user_time_spent_changed
+    - i_code_review_user_toggled_task_item_status
+    - i_code_review_user_unapprove_mr
+    - i_code_review_user_unmarked_as_draft
+    - i_code_review_user_unresolve_thread
+    - i_code_review_user_vs_code_api_request
+    - i_code_review_widget_nothing_merge_click_new_file
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index aa25ab379b9..16186a412b8 100755
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -51,6 +51,7 @@ options:
   - p_ci_templates_security_dast_api
   - p_ci_templates_security_dast_api_latest
   - p_ci_templates_security_container_scanning
+  - p_ci_templates_security_container_scanning_latest
   - p_ci_templates_security_dast_latest
   - p_ci_templates_security_dependency_scanning
   - p_ci_templates_security_api_fuzzing
@@ -94,7 +95,9 @@ options:
   - p_ci_templates_jobs_code_intelligence
   - p_ci_templates_jobs_code_quality
   - p_ci_templates_jobs_dependency_scanning
+  - p_ci_templates_jobs_dependency_scanning_latest
   - p_ci_templates_jobs_license_scanning
+  - p_ci_templates_jobs_license_scanning_latest
   - p_ci_templates_jobs_deploy_ecs
   - p_ci_templates_jobs_deploy_ec2
   - p_ci_templates_jobs_deploy
@@ -172,6 +175,7 @@ options:
   - p_ci_templates_liquibase
   - p_ci_templates_matlab
   - p_ci_templates_themekit
+  - p_ci_templates_katalon
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
index 671b8a1785a..28adf6d6d01 100644
--- a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -15,17 +15,13 @@ options:
   events:
   - i_package_composer_deploy_token
   - i_package_conan_deploy_token
-  - i_package_container_deploy_token
-  - i_package_debian_deploy_token
   - i_package_generic_deploy_token
-  - i_package_golang_deploy_token
   - i_package_helm_deploy_token
   - i_package_maven_deploy_token
   - i_package_npm_deploy_token
   - i_package_nuget_deploy_token
   - i_package_pypi_deploy_token
   - i_package_rubygems_deploy_token
-  - i_package_tag_deploy_token
   - i_package_terraform_module_deploy_token
 distribution:
 - ee
diff --git a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
index 81181baa4ee..e7465b79667 100644
--- a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
@@ -15,17 +15,13 @@ options:
   events:
   - i_package_composer_user
   - i_package_conan_user
-  - i_package_container_user
-  - i_package_debian_user
   - i_package_generic_user
-  - i_package_golang_user
   - i_package_helm_user
   - i_package_maven_user
   - i_package_npm_user
   - i_package_nuget_user
   - i_package_pypi_user
   - i_package_rubygems_user
-  - i_package_tag_user
   - i_package_terraform_module_user
 distribution:
 - ee
diff --git a/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml b/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml
index 3e47fca1265..ec725e331e9 100644
--- a/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml
+++ b/config/metrics/counts_7d/20220131143201_i_quickactions_attention_weekly.yml
@@ -6,7 +6,9 @@ product_stage: create
 product_group: code_review
 product_category: code_review
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95241/
+milestone_removed: '15.4'
 milestone: '14.8'
 introduced_by_url:
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml b/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml
index 315cac183d1..275776eb793 100644
--- a/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml
+++ b/config/metrics/counts_7d/20220131153223_i_quickactions_remove_attention_weekly.yml
@@ -6,7 +6,9 @@ product_stage: create
 product_group: code_review
 product_category: code_review
 value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95241/
+milestone_removed: '15.4'
 milestone: '14.8'
 introduced_by_url:
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml
new file mode 100644
index 00000000000..b59129cea27
--- /dev/null
+++ b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_commit_weekly.yml
@@ -0,0 +1,27 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_count_notes_in_ipynb_diff_commit_weekly
+name: "count_notes_in_ipynb_diff_commit_weekly"
+description: Weekly notes on ipynb commit diffs
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85398
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_create_note_in_ipynb_diff_commit
+data_category: Optional
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml
new file mode 100644
index 00000000000..30947b412fe
--- /dev/null
+++ b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_mr_weekly.yml
@@ -0,0 +1,27 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_count_notes_in_ipynb_diff_mr_weekly
+name: "count_notes_in_ipynb_diff_mr_weekly"
+description: Weekly notes on ipynb MR diffs
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85398
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_create_note_in_ipynb_diff_mr
+data_category: Optional
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml
new file mode 100644
index 00000000000..d1f331ac1e1
--- /dev/null
+++ b/config/metrics/counts_7d/20220504150641_count_notes_in_ipynb_diff_weekly.yml
@@ -0,0 +1,27 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_count_notes_in_ipynb_diff_weekly
+name: "count_notes_in_ipynb_diff_weekly"
+description: Weekly notes on ipynb diffs
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85398
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_create_note_in_ipynb_diff
+data_category: Optional
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml
new file mode 100644
index 00000000000..d57c100ec1e
--- /dev/null
+++ b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_commit_weekly.yml
@@ -0,0 +1,27 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_count_users_with_notes_in_ipynb_diff_commit_weekly
+name: "count_users_with_notes_in_ipynb_diff_commit_weekly"
+description: Weekly unique users with notes on ipynb commit diffs
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85398
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_note_in_ipynb_diff_commit
+data_category: Optional
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml
new file mode 100644
index 00000000000..64d856782c2
--- /dev/null
+++ b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_mr_weekly.yml
@@ -0,0 +1,27 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_count_users_with_notes_in_ipynb_diff_mr_weekly
+name: "count_users_with_notes_in_ipynb_diff_mr_weekly"
+description: Weekly unique users with notes on ipynb MR diffs
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85398
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_note_in_ipynb_diff_mr
+data_category: Optional
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml
new file mode 100644
index 00000000000..3d01988de75
--- /dev/null
+++ b/config/metrics/counts_7d/20220504150641_count_users_with_notes_in_ipynb_diff_weekly.yml
@@ -0,0 +1,27 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_count_users_with_notes_in_ipynb_diff_weekly
+name: "count_users_with_notes_in_ipynb_diff_weekly"
+description: Weekly unique users with notes on ipynb diffs
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85398
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_user_create_note_in_ipynb_diff
+data_category: Optional
+performance_indicator_type: []
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml b/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
new file mode 100644
index 00000000000..f668646eacb
--- /dev/null
+++ b/config/metrics/counts_7d/20220531145014_p_ci_templates_katalon_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_katalon_weekly
+description: 'Weekly counts of times users have executed katalon_tests jobs'
+product_section: 'ops'
+product_stage: 'analytics'
+product_group: 'pipeline_authoring'
+product_category: 'pipeline_authoring'
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86484
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_katalon
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220627133128_i_code_review_submit_review_approve_weekly.yml b/config/metrics/counts_7d/20220627133128_i_code_review_submit_review_approve_weekly.yml
new file mode 100644
index 00000000000..2275bf185d8
--- /dev/null
+++ b/config/metrics/counts_7d/20220627133128_i_code_review_submit_review_approve_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_submit_review_approve_weekly
+description: Count of unique users per week who submit a review and approve
+product_stage: create
+product_group: code_review
+product_category: code_review
+product_section: dev
+value_type: number
+status: active
+milestone: '15.4'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91073
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_submit_review_approve
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20220627134100_i_code_review_submit_review_comment_weekly.yml b/config/metrics/counts_7d/20220627134100_i_code_review_submit_review_comment_weekly.yml
new file mode 100644
index 00000000000..16029f05626
--- /dev/null
+++ b/config/metrics/counts_7d/20220627134100_i_code_review_submit_review_comment_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_submit_review_comment_weekly
+description: Count of unique users per week who submit a review with a comment
+product_stage: create
+product_group: code_review
+product_category: code_review
+product_section: dev
+value_type: number
+status: active
+milestone: '15.4'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91073
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_submit_review_comment
+distribution:
+  - ce
+  - ee
+tier:
+  - free
+  - premium
+  - ultimate
diff --git a/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml b/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml
new file mode 100644
index 00000000000..814a50554c1
--- /dev/null
+++ b/config/metrics/counts_7d/20220825142528_i_testing_test_report_uploaded_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.testing.i_testing_test_report_uploaded_weekly
+description: "MAU of junit test reports uploaded by customers per pipeline"
+product_section: ops
+product_stage: verify
+product_group: pipeline_insights
+product_category: testing
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95112
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_test_report_uploaded
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml b/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml
new file mode 100644
index 00000000000..6e9415bdc42
--- /dev/null
+++ b/config/metrics/counts_7d/20220830104410_i_code_review_merge_request_widget_license_compliance_view_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_license_compliance_view_weekly
+description: The count of unique users (weekly) who were able to see the License Compliance widget extension
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_merge_request_widget_license_compliance_view
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml
new file mode 100644
index 00000000000..c3a8d7bfdfb
--- /dev/null
+++ b/config/metrics/counts_7d/20220830104418_i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_license_compliance_full_report_clicked_weekly
+description: The count of unique users (weekly) who clicked the Full Report button on the License Compliance widget extension
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_merge_request_widget_license_compliance_full_report_clicked
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml b/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml
new file mode 100644
index 00000000000..69083c5ca2c
--- /dev/null
+++ b/config/metrics/counts_7d/20220830104424_i_code_review_merge_request_widget_license_compliance_expand_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_license_compliance_expand_weekly
+description: The count of unique users (weekly) who expanded the License Compliance widget extension
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_merge_request_widget_license_compliance_expand
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml b/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml
new file mode 100644
index 00000000000..d145ae31f38
--- /dev/null
+++ b/config/metrics/counts_7d/20220830104431_i_code_review_merge_request_widget_license_compliance_expand_success_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_license_compliance_expand_success_weekly
+description: The count of unique users (weekly) who expanded the License Compliance widget extension while it is in its Success state
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_merge_request_widget_license_compliance_expand_success
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml b/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml
new file mode 100644
index 00000000000..58c3d89497f
--- /dev/null
+++ b/config/metrics/counts_7d/20220830104438_i_code_review_merge_request_widget_license_compliance_expand_warning_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_license_compliance_expand_warning_weekly
+description: The count of unique users (weekly) who expanded the License Compliance widget extension while it is in its Warning state
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_merge_request_widget_license_compliance_expand_warning
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml b/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml
new file mode 100644
index 00000000000..d8d9637f920
--- /dev/null
+++ b/config/metrics/counts_7d/20220830104446_i_code_review_merge_request_widget_license_compliance_expand_failed_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_license_compliance_expand_failed_weekly
+description: The count of unique users (weekly) who expanded the License Compliance widget extension while it is in its Failed state
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/96538"
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_code_review_merge_request_widget_license_compliance_expand_failed
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220907080626_i_quickactions_timeline_weekly.yml b/config/metrics/counts_7d/20220907080626_i_quickactions_timeline_weekly.yml
new file mode 100644
index 00000000000..5b10a9a93d4
--- /dev/null
+++ b/config/metrics/counts_7d/20220907080626_i_quickactions_timeline_weekly.yml
@@ -0,0 +1,27 @@
+---
+key_path: redis_hll_counters.quickactions.i_quickactions_timeline_weekly
+name: quickactions_timeline_weekly
+description: Count of WAU using the `/timeline` quick action
+product_section: ops
+product_stage: monitor
+product_group: respond
+product_category: incident_management
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97020
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_quickactions_timeline
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml b/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml
new file mode 100644
index 00000000000..c8e4c285492
--- /dev/null
+++ b/config/metrics/counts_7d/20220907084343_p_ci_templates_implicit_security_sast_iac_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_iac_weekly
+description: Count of pipelines with implicit SAST runs using the stable SAST IaC template
+product_section: sec
+product_stage: secure
+product_group: "static_analysis"
+product_category: SAST
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86275
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_jobs_sast_iac
diff --git a/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml b/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml
new file mode 100644
index 00000000000..faf4df4b772
--- /dev/null
+++ b/config/metrics/counts_7d/20220907102710_p_ci_templates_implicit_jobs_sast_iac_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_iac_weekly
+description: Count of pipelines with implicit SAST jobs using the stable SAST IaC template
+product_section: sec
+product_stage: secure
+product_group: "static_analysis"
+product_category: SAST
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86275
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_jobs_sast_iac
diff --git a/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml
new file mode 100644
index 00000000000..c2a9f72ec8b
--- /dev/null
+++ b/config/metrics/counts_7d/20220907202801_p_ci_templates_jobs_dependency_scanning_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_dependency_scanning_latest_weekly
+description: Weekly counts for Dependency Scanning CI Latest template (Jobs folder)
+product_section: sec
+product_stage: secure
+product_group: composition_analysis
+product_category: dependency_scanning
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323'
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_jobs_dependency_scanning_latest
diff --git a/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml
new file mode 100644
index 00000000000..8e7c6e8cbaf
--- /dev/null
+++ b/config/metrics/counts_7d/20220907211959_p_ci_templates_security_container_scanning_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_container_scanning_latest_weekly
+description: Weekly counts for Container Scanning CI Latest template (Security folder)
+product_section: sec
+product_stage: secure
+product_group: composition_analysis
+product_category: container_scanning
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323'
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_security_container_scanning_latest
diff --git a/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml
new file mode 100644
index 00000000000..f3cb628da5a
--- /dev/null
+++ b/config/metrics/counts_7d/20220907215629_p_ci_templates_jobs_license_scanning_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_license_scanning_latest_weekly
+description: Weekly counts for License Scanning CI Latest template (Jobs folder)
+product_section: sec
+product_stage: secure
+product_group: composition_analysis
+product_category: license_scanning
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323'
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_jobs_license_scanning_latest
diff --git a/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml
new file mode 100644
index 00000000000..243d24bcf50
--- /dev/null
+++ b/config/metrics/counts_7d/20220912161233_p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_dependency_scanning_latest_weekly
+description: Weekly counts for implicit Dependency Scanning CI Latest template (Jobs folder)
+product_section: sec
+product_stage: secure
+product_group: composition_analysis
+product_category: dependency_scanning
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323'
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_jobs_dependency_scanning_latest
diff --git a/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml
new file mode 100644
index 00000000000..8fdd6c15c1d
--- /dev/null
+++ b/config/metrics/counts_7d/20220912162301_p_ci_templates_implicit_jobs_license_scanning_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_license_scanning_latest_weekly
+description: Weekly counts for implicit License Scanning CI Latest template (Jobs folder)
+product_section: sec
+product_stage: secure
+product_group: composition_analysis
+product_category: license_scanning
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323'
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_jobs_license_scanning_latest
diff --git a/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml
new file mode 100644
index 00000000000..c3818fb819c
--- /dev/null
+++ b/config/metrics/counts_7d/20220912162745_p_ci_templates_implicit_security_container_scanning_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_security_container_scanning_latest_weekly
+description: Weekly counts for implicit Container Scanning CI Latest template (Security folder)
+product_section: sec
+product_stage: secure
+product_group: composition_analysis
+product_category: container_scanning
+value_type: number
+status: active
+milestone: "15.4"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97323'
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+  - p_ci_templates_implicit_security_container_scanning_latest