Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

11 files changed, 166 insertions, 4 deletions

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 b0cca62db12..a3696ba0098 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
@@ -88,7 +88,9 @@ options:
   - p_ci_templates_jobs_load_performance_testing
   - p_ci_templates_jobs_helm_2to3
   - p_ci_templates_jobs_sast
+  - p_ci_templates_jobs_sast_latest
   - p_ci_templates_jobs_secret_detection
+  - p_ci_templates_jobs_secret_detection_latest
   - p_ci_templates_jobs_code_intelligence
   - p_ci_templates_jobs_code_quality
   - p_ci_templates_jobs_dependency_scanning
diff --git a/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml b/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
index 200f46ac22d..b7fd799f8a6 100644
--- a/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901221654_p_ci_templates_security_cluster_image_scanning_weekly.yml
@@ -6,7 +6,9 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
+milestone_removed: '15.0'
+removed_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87000'
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml b/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
index 592f52a0681..b93751d3c30 100644
--- a/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
+++ b/config/metrics/counts_7d/20210901221844_p_ci_templates_managed_cluster_applications_weekly.yml
@@ -6,9 +6,11 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86267
+milestone_removed: '15.0'
 time_frame: 7d
 data_source: redis_hll
 data_category: optional
diff --git a/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml b/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
index 86c3ca6e3df..060893ca349 100644
--- a/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
+++ b/config/metrics/counts_7d/20210901221928_p_ci_templates_serverless_weekly.yml
@@ -6,9 +6,11 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/86267
+milestone_removed: '15.0'
 time_frame: 7d
 data_source: redis_hll
 data_category: optional
diff --git a/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml b/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
index e1ee3f9fd1d..04ba99db306 100644
--- a/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
+++ b/config/metrics/counts_7d/20210901223912_p_ci_templates_implicit_security_cluster_image_scanning_weekly.yml
@@ -6,7 +6,9 @@ product_stage: ''
 product_group: ''
 product_category: ''
 value_type: number
-status: active
+status: removed
+milestone_removed: '15.0'
+removed_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87000'
 milestone: '14.3'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
diff --git a/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml b/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
new file mode 100644
index 00000000000..1b65c7b1c84
--- /dev/null
+++ b/config/metrics/counts_7d/20220308233959_p_ci_templates_jobs_sast_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_latest_weekly
+description: Weekly counts for SAST CI Latest template (Jobs folder)
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: static_application_security_testing
+value_type: number
+status: active
+milestone: "15.0"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81847'
+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_sast_latest
diff --git a/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml b/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
new file mode 100644
index 00000000000..64760e33d59
--- /dev/null
+++ b/config/metrics/counts_7d/20220309001635_p_ci_templates_jobs_secret_detection_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_secret_detection_latest_weekly
+description: Weekly counts for Secret Detection CI Latest template (Jobs folder)
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: static_application_security_testing
+value_type: number
+status: active
+milestone: "15.0"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81847'
+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_secret_detection_latest
diff --git a/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml b/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
new file mode 100644
index 00000000000..13d03d6c833
--- /dev/null
+++ b/config/metrics/counts_7d/20220310213315_p_ci_templates_implicit_jobs_secret_detection_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_secret_detection_latest_weekly
+description: Weekly counts for implicit use of Secret Detection CI Latest template (Jobs folder)
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: static_application_security_testing
+value_type: number
+status: active
+milestone: "15.0"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81847'
+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_secret_detection_latest
diff --git a/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml b/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
new file mode 100644
index 00000000000..74eb8fffa9a
--- /dev/null
+++ b/config/metrics/counts_7d/20220310213743_p_ci_templates_implicit_jobs_sast_latest_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_sast_latest_weekly
+description: Weekly counts for implicit use of SAST CI Latest template (Jobs folder)
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: static_application_security_testing
+value_type: number
+status: active
+milestone: "15.0"
+introduced_by_url: 'https://gitlab.com/gitlab-org/gitlab/-/merge_requests/81847'
+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_sast_latest
diff --git a/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml b/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
new file mode 100644
index 00000000000..9bba92b5162
--- /dev/null
+++ b/config/metrics/counts_7d/20220510024437_p_ci_templates_jobs_sast_iac_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_sast_iac_weekly
+description: Count of pipelines using the stable SAST IaC template
+product_section: sec
+product_stage: secure
+product_group: "group::static analysis"
+product_category: SAST
+value_type: number
+status: active
+milestone: "15.0"
+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_jobs_sast_iac
diff --git a/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml b/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
new file mode 100644
index 00000000000..c28dfd94cad
--- /dev/null
+++ b/config/metrics/counts_7d/20220510024437_p_ci_templates_security_sast_iac_weekly.yml
@@ -0,0 +1,26 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_security_sast_iac_weekly
+description: Count of pipelines using the stable SAST IaC template
+product_section: sec
+product_stage: secure
+product_group: "group::static analysis"
+product_category: SAST
+value_type: number
+status: active
+milestone: "15.0"
+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_security_sast_iac