Add latest changes from gitlab-org/gitlab@master

5 files changed, 58 insertions, 0 deletions

diff --git a/config/feature_flags/development/adherence_report_ui.yml b/config/feature_flags/development/adherence_report_ui.yml
new file mode 100644
index 00000000000..5648299c689
--- /dev/null
+++ b/config/feature_flags/development/adherence_report_ui.yml
@@ -0,0 +1,8 @@
+---
+name: adherence_report_ui
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/122374
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/414495
+milestone: '16.1'
+type: development
+group: group::compliance
+default_enabled: false
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 9358d756644..bfef9b0ed10 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
@@ -179,6 +179,7 @@ options:
   - p_ci_templates_katalon
   - p_ci_templates_terraform_module_base
   - p_ci_templates_terraform_module
+  - p_ci_templates_pages_zola
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20230527152402_p_ci_templates_pages_zola_monthly.yml b/config/metrics/counts_28d/20230527152402_p_ci_templates_pages_zola_monthly.yml
new file mode 100644
index 00000000000..778b70d699d
--- /dev/null
+++ b/config/metrics/counts_28d/20230527152402_p_ci_templates_pages_zola_monthly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_zola_monthly
+description: Count of pipelines using the Zola Pages template
+product_section: ''
+product_stage: ''
+product_group: ''
+value_type: number
+status: active
+milestone: "16.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121946
+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_pages_zola
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 64ef9858a64..3e1becde7d7 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
@@ -180,6 +180,7 @@ options:
   - p_ci_templates_katalon
   - p_ci_templates_terraform_module_base
   - p_ci_templates_terraform_module
+  - p_ci_templates_pages_zola
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20230527152358_p_ci_templates_pages_zola_weekly.yml b/config/metrics/counts_7d/20230527152358_p_ci_templates_pages_zola_weekly.yml
new file mode 100644
index 00000000000..d2cde6a4510
--- /dev/null
+++ b/config/metrics/counts_7d/20230527152358_p_ci_templates_pages_zola_weekly.yml
@@ -0,0 +1,24 @@
+---
+key_path: redis_hll_counters.ci_templates.p_ci_templates_pages_zola_weekly
+description: Count of pipelines using the Zola Pages template
+product_section: ''
+product_stage: ''
+product_group: ''
+value_type: number
+status: active
+milestone: "16.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121946
+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_pages_zola