Add latest changes from gitlab-org/gitlab@15-7-stable-eev15.7.0-rc42

14 files changed, 278 insertions, 0 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 420926c825c..07985c3e56e 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
@@ -132,6 +132,12 @@ options:
     - i_code_review_user_unresolve_thread
     - i_code_review_user_vs_code_api_request
     - i_code_review_widget_nothing_merge_click_new_file
+    - i_code_review_merge_request_widget_security_reports_expand
+    - i_code_review_merge_request_widget_security_reports_expand_failed
+    - i_code_review_merge_request_widget_security_reports_expand_success
+    - i_code_review_merge_request_widget_security_reports_expand_warning
+    - i_code_review_merge_request_widget_security_reports_full_report_clicked
+    - i_code_review_merge_request_widget_security_reports_view
 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 f3758f5bd06..029742453d8 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
@@ -94,6 +94,8 @@ options:
   - p_ci_templates_jobs_secret_detection_latest
   - p_ci_templates_jobs_code_intelligence
   - p_ci_templates_jobs_code_quality
+  - p_ci_templates_jobs_container_scanning
+  - p_ci_templates_jobs_container_scanning_latest
   - p_ci_templates_jobs_dependency_scanning
   - p_ci_templates_jobs_dependency_scanning_latest
   - p_ci_templates_jobs_license_scanning
@@ -142,6 +144,7 @@ options:
   - p_ci_templates_implicit_jobs_secret_detection
   - p_ci_templates_implicit_jobs_code_intelligence
   - p_ci_templates_implicit_jobs_code_quality
+  - p_ci_templates_implicit_jobs_container_scanning
   - p_ci_templates_implicit_jobs_dependency_scanning
   - p_ci_templates_implicit_jobs_license_scanning
   - p_ci_templates_implicit_jobs_deploy_ecs
diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
index f29f4d0cf28..f9acb05be3e 100644
--- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -134,3 +134,9 @@ options:
     - 'i_code_review_merge_request_widget_license_compliance_expand_success'
     - 'i_code_review_merge_request_widget_license_compliance_expand_warning'
     - 'i_code_review_merge_request_widget_license_compliance_expand_failed'
+    - 'i_code_review_merge_request_widget_security_reports_view'
+    - 'i_code_review_merge_request_widget_security_reports_full_report_clicked'
+    - 'i_code_review_merge_request_widget_security_reports_expand'
+    - 'i_code_review_merge_request_widget_security_reports_expand_success'
+    - 'i_code_review_merge_request_widget_security_reports_expand_warning'
+    - 'i_code_review_merge_request_widget_security_reports_expand_failed'
diff --git a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
index e40e7c7f19a..6ceeef68c21 100644
--- a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -132,3 +132,9 @@ options:
     - 'i_code_review_merge_request_widget_license_compliance_expand_success'
     - 'i_code_review_merge_request_widget_license_compliance_expand_warning'
     - 'i_code_review_merge_request_widget_license_compliance_expand_failed'
+    - 'i_code_review_merge_request_widget_security_reports_view'
+    - 'i_code_review_merge_request_widget_security_reports_full_report_clicked'
+    - 'i_code_review_merge_request_widget_security_reports_expand'
+    - 'i_code_review_merge_request_widget_security_reports_expand_success'
+    - 'i_code_review_merge_request_widget_security_reports_expand_warning'
+    - 'i_code_review_merge_request_widget_security_reports_expand_failed'
diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml
new file mode 100644
index 00000000000..8c081dd8a77
--- /dev/null
+++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_container_scanning_weekly
+description: Weekly counts for implicit use of Container Scanning CI template (Jobs folder)
+product_section: sec
+product_stage: secure
+product_group: composition_analysis
+product_category: container_scanning
+value_type: number
+status: active
+milestone: '15.6'
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103262"
+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_container_scanning
diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml
new file mode 100644
index 00000000000..7535ebc57a2
--- /dev/null
+++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_container_scanning_latest_weekly
+description: Weekly counts for Container Scanning CI Latest template (Jobs folder)
+product_section: sec
+product_stage: secure
+product_group: composition_analysis
+product_category: container_scanning
+value_type: number
+status: active
+milestone: '15.6'
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103262"
+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_container_scanning_latest
diff --git a/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml
new file mode 100644
index 00000000000..4f79b514af5
--- /dev/null
+++ b/config/metrics/counts_7d/20221108092725_p_ci_templates_jobs_container_scanning_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_container_scanning_weekly
+description: Weekly counts for Container Scanning CI template (Jobs folder)
+product_section: sec
+product_stage: secure
+product_group: composition_analysis
+product_category: container_scanning
+value_type: number
+status: active
+milestone: '15.6'
+introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/103262"
+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_container_scanning
diff --git a/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml b/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml
new file mode 100644
index 00000000000..751337d22d3
--- /dev/null
+++ b/config/metrics/counts_7d/20221121115618_i_code_review_merge_request_widget_security_reports_view_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_view_weekly
+description: The count of unique users (weekly) who were able to see the Security Reports widget extension
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - i_code_review_merge_request_widget_security_reports_view
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml
new file mode 100644
index 00000000000..1f123bb8c68
--- /dev/null
+++ b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_expand_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_weekly
+description: The count of unique users (weekly) who expanded the Security Reports widget extension
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - i_code_review_merge_request_widget_security_reports_expand
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml
new file mode 100644
index 00000000000..925b2730c2c
--- /dev/null
+++ b/config/metrics/counts_7d/20221121115619_i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_full_report_clicked_weekly
+description: The count of unique users (weekly) who clicked the Full Report button on the Security Reports widget extension
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - i_code_review_merge_request_widget_security_reports_full_report_clicked
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml b/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml
new file mode 100644
index 00000000000..84163e934cb
--- /dev/null
+++ b/config/metrics/counts_7d/20221121115620_i_code_review_merge_request_widget_security_reports_expand_success_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_success_weekly
+description: The count of unique users (weekly) who expanded the Security Reports 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.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - i_code_review_merge_request_widget_security_reports_expand_success
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml
new file mode 100644
index 00000000000..b5729bc1ec9
--- /dev/null
+++ b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_failed_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_failed_weekly
+description: The count of unique users (weekly) who expanded the Security Reports 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.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - i_code_review_merge_request_widget_security_reports_expand_failed
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml
new file mode 100644
index 00000000000..061b3a0fb30
--- /dev/null
+++ b/config/metrics/counts_7d/20221121115621_i_code_review_merge_request_widget_security_reports_expand_warning_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_merge_request_widget_security_reports_expand_warning_weekly
+description: The count of unique users (weekly) who expanded the Security Reports 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.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104578
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+    - i_code_review_merge_request_widget_security_reports_expand_warning
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml b/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
new file mode 100644
index 00000000000..43405d5bd2c
--- /dev/null
+++ b/config/metrics/counts_7d/20221213183300_i_code_review_create_mr_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.code_review.i_code_review_create_mr_weekly
+description: Count of unique merge requests created per week
+product_section: dev
+product_stage: create
+product_group: code_review
+product_category: code_review
+value_type: number
+status: active
+milestone: "15.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/106869
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+performance_indicator_type: []
+options:
+  events:
+  - i_code_review_create_mr
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate