Add latest changes from gitlab-org/gitlab@master

8 files changed, 156 insertions, 0 deletions

diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index 554b5c57bb6..4b972a3315d 100755
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.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_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml
new file mode 100644
index 00000000000..62ce68dd4e6
--- /dev/null
+++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_implicit_jobs_container_scanning_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_jobs_container_scanning_monthly
+description: Monthly 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: 28d
+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_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml
new file mode 100644
index 00000000000..df169b9eb48
--- /dev/null
+++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_latest_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_container_scanning_latest_monthly
+description: Monthly 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: 28d
+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_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml
new file mode 100644
index 00000000000..2abbb3f9b16
--- /dev/null
+++ b/config/metrics/counts_28d/20221108092725_p_ci_templates_jobs_container_scanning_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_jobs_container_scanning_monthly
+description: Monthly 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: 28d
+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/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/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