16 files changed, 135 insertions, 33 deletions
diff --git a/config/feature_flags/development/validate_release_with_author.yml b/config/feature_flags/development/validate_release_with_author.yml
new file mode 100644
index 00000000000..45102103183
--- /dev/null
+++ b/config/feature_flags/development/validate_release_with_author.yml
@@ -0,0 +1,8 @@
+---
+name: validate_release_with_author
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89694
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/365350
+milestone: '15.1'
+type: development
+group: group::release
+default_enabled: false
diff --git a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
index f1bff756c5f..791cad7b6e2 100644
--- a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
@@ -10,6 +10,29 @@ value_type: number
 status: active
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - users_viewing_analytics_group_devops_adoption
+  - i_analytics_dev_ops_adoption
+  - i_analytics_dev_ops_score
+  - p_analytics_merge_request
+  - i_analytics_instance_statistics
+  - g_analytics_contribution
+  - g_analytics_insights
+  - g_analytics_issues
+  - g_analytics_productivity
+  - g_analytics_valuestream
+  - p_analytics_pipelines
+  - p_analytics_code_reviews
+  - p_analytics_valuestream
+  - p_analytics_insights
+  - p_analytics_issues
+  - p_analytics_repo
+  - i_analytics_cohorts
+  - p_analytics_ci_cd_pipelines
+  - p_analytics_ci_cd_deployment_frequency
+  - p_analytics_ci_cd_lead_time
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml b/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml
index c34f5644053..8c491bc24b1 100644
--- a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
+++ b/config/metrics/counts_7d/20210216174846_p_analytics_pipelines.yml
@@ -8,8 +8,12 @@ product_group: group::optimize
 product_category:
 value_type: number
 status: active
-time_frame: all
+time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - p_analytics_pipelines
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml b/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml
index 671cd9a10b3..0cb77ed4933 100644
--- a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
+++ b/config/metrics/counts_7d/20210216174850_p_analytics_valuestream.yml
@@ -8,8 +8,12 @@ product_group: group::optimize
 product_category:
 value_type: number
 status: active
-time_frame: all
+time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - p_analytics_valuestream
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml b/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml
index 5e6e308d8d2..fc1fb3470db 100644
--- a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
+++ b/config/metrics/counts_7d/20210216174856_p_analytics_repo.yml
@@ -8,8 +8,12 @@ product_group: group::optimize
 product_category:
 value_type: number
 status: active
-time_frame: all
+time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - p_analytics_repo
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml b/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml
index 9a06f4c44df..705cfefc5b5 100644
--- a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
+++ b/config/metrics/counts_7d/20210216174858_i_analytics_cohorts.yml
@@ -8,8 +8,12 @@ product_group: group::optimize
 product_category:
 value_type: number
 status: active
-time_frame: all
+time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_analytics_cohorts
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
index 9130eb837e7..72db511d1e7 100644
--- a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
+++ b/config/metrics/counts_7d/20210216174900_i_analytics_dev_ops_score.yml
@@ -8,8 +8,12 @@ product_group: group::optimize
 product_category:
 value_type: number
 status: active
-time_frame: all
+time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_analytics_dev_ops_score
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml b/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml
index af9338f028a..0e726cfceae 100644
--- a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_7d/20210216174902_g_analytics_merge_request.yml
@@ -8,8 +8,12 @@ product_group: group::optimize
 product_category:
 value_type: number
 status: removed
-time_frame: all
+time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - g_analytics_merge_request
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml b/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml
index 5ee75f27529..06123553499 100644
--- a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
+++ b/config/metrics/counts_7d/20210216174906_i_analytics_instance_statistics.yml
@@ -8,8 +8,12 @@ product_group: group::optimize
 product_category:
 value_type: number
 status: active
-time_frame: all
+time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_analytics_instance_statistics
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
new file mode 100644
index 00000000000..cdc7ee79752
--- /dev/null
+++ b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
@@ -0,0 +1,44 @@
+---
+data_category: optional
+key_path: analytics_unique_visits.analytics_unique_visits_for_any_target
+description: Unique visitors to any analytics feature by week
+product_section: dev
+product_stage: manage
+product_group: group::optimize
+product_category:
+value_type: number
+status: active
+time_frame: 7d
+data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - users_viewing_analytics_group_devops_adoption
+  - i_analytics_dev_ops_adoption
+  - i_analytics_dev_ops_score
+  - p_analytics_merge_request
+  - i_analytics_instance_statistics
+  - g_analytics_contribution
+  - g_analytics_insights
+  - g_analytics_issues
+  - g_analytics_productivity
+  - g_analytics_valuestream
+  - p_analytics_pipelines
+  - p_analytics_code_reviews
+  - p_analytics_valuestream
+  - p_analytics_insights
+  - p_analytics_issues
+  - p_analytics_repo
+  - i_analytics_cohorts
+  - p_analytics_ci_cd_pipelines
+  - p_analytics_ci_cd_deployment_frequency
+  - p_analytics_ci_cd_lead_time
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
index 7a524dee720..b79b021901c 100644
--- a/config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml
+++ b/config/metrics/counts_7d/20210423005644_i_analytics_dev_ops_adoption.yml
@@ -9,8 +9,12 @@ product_category:
 value_type: number
 status: active
 milestone: "13.11"
-time_frame: all
+time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - i_analytics_dev_ops_adoption
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml b/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml
index b8ae877b0be..2f5415c7802 100644
--- a/config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml
+++ b/config/metrics/counts_7d/20210428142406_users_viewing_analytics_group_devops_adoption.yml
@@ -10,8 +10,12 @@ product_category:
 value_type: number
 status: active
 milestone: "13.12"
-time_frame: all
+time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - users_viewing_analytics_group_devops_adoption
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_all/20211126090001_p_analytics_ci_cd_pipelines.yml b/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml
index 7e6820b0d24..ec686425d7c 100644
--- a/config/metrics/counts_all/20211126090001_p_analytics_ci_cd_pipelines.yml
+++ b/config/metrics/counts_7d/20211126090001_p_analytics_ci_cd_pipelines.yml
@@ -10,8 +10,12 @@ value_type: number
 status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
-time_frame: all
+time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - p_analytics_ci_cd_pipelines
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_all/20211126090002_p_analytics_ci_cd_deployment_frequency.yml b/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
index 134f43b1b27..bee4b88889e 100644
--- a/config/metrics/counts_all/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
+++ b/config/metrics/counts_7d/20211126090002_p_analytics_ci_cd_deployment_frequency.yml
@@ -10,8 +10,12 @@ value_type: number
 status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
-time_frame: all
+time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - p_analytics_ci_cd_deployment_frequency
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_all/20211126090003_p_analytics_ci_cd_lead_time.yml b/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml
index a167a380432..3c1f6082049 100644
--- a/config/metrics/counts_all/20211126090003_p_analytics_ci_cd_lead_time.yml
+++ b/config/metrics/counts_7d/20211126090003_p_analytics_ci_cd_lead_time.yml
@@ -10,8 +10,12 @@ value_type: number
 status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
-time_frame: all
+time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+  - p_analytics_ci_cd_lead_time
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
deleted file mode 100644
index 488bb48be0e..00000000000
--- a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-data_category: optional
-key_path: analytics_unique_visits.analytics_unique_visits_for_any_target
-description: Unique visitors to any analytics feature by week
-product_section: dev
-product_stage: manage
-product_group: group::optimize
-product_category:
-value_type: number
-status: active
-time_frame: all
-data_source: redis_hll
-distribution:
-- ce
-- ee
-tier:
-- free
-- premium
-- ultimate
-performance_indicator_type: []
-milestone: "<13.9"