Add latest changes from gitlab-org/gitlab@master

11 files changed, 46 insertions, 16 deletions

diff --git a/config/feature_flags/development/dependency_proxy_deploy_tokens.yml b/config/feature_flags/development/dependency_proxy_deploy_tokens.yml
deleted file mode 100644
index f3cb1fc2c18..00000000000
--- a/config/feature_flags/development/dependency_proxy_deploy_tokens.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: dependency_proxy_deploy_tokens
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64363
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/334565
-milestone: '14.2'
-type: development
-group: group::package
-default_enabled: false
diff --git a/config/feature_flags/development/multiple_database_metrics.yml b/config/feature_flags/development/multiple_database_metrics.yml
deleted file mode 100644
index 7a700982022..00000000000
--- a/config/feature_flags/development/multiple_database_metrics.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: multiple_database_metrics
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63490
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/333227
-milestone: '14.1'
-type: development
-group: group::sharding
-default_enabled: false
diff --git a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
index 23a7074e72a..97479d10ff2 100644
--- a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
+++ b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
@@ -11,6 +11,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_test_case_parsed
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
index 3e6e920e3ec..b4b800d1e10 100644
--- a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
@@ -10,6 +10,20 @@ value_type: number
 status: removed
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_test_case_parsed
+    - i_testing_metrics_report_widget_total
+    - i_testing_group_code_coverage_visit_total
+    - i_testing_full_code_quality_report_total
+    - i_testing_web_performance_widget_total
+    - i_testing_group_code_coverage_project_click_total
+    - i_testing_load_performance_widget_total
+    - i_testing_metrics_report_artifact_uploaders
+    - i_testing_summary_widget_total
+    - users_expanding_testing_code_quality_report
+    - users_expanding_testing_accessibility_report
 distribution:
 - ce
 tier:
diff --git a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
index d993b1a1ce7..a86d69b33fb 100644
--- a/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100451_users_expanding_testing_code_quality_report_monthly.yml
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_testing_code_quality_report
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
index 01d6512d124..5c8f72e96b9 100644
--- a/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
+++ b/config/metrics/counts_28d/20210409100628_users_expanding_testing_accessibility_report_monthly.yml
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_testing_accessibility_report
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
index 8e2da49198b..aeaf9615ec4 100644
--- a/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
+++ b/config/metrics/counts_28d/20210413205507_i_testing_summary_widget_total_monthly.yml
@@ -12,6 +12,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_summary_widget_total
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
index c7ce2c729e1..6764ce3be94 100644
--- a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
+++ b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
@@ -11,6 +11,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_test_case_parsed
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
index 11aad6e8af1..13cc4ae2498 100644
--- a/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100451_users_expanding_testing_code_quality_report_weekly.yml
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_testing_code_quality_report
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
index b6929fd771f..e59e3e0bd7c 100644
--- a/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
+++ b/config/metrics/counts_7d/20210409100628_users_expanding_testing_accessibility_report_weekly.yml
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57133
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_expanding_testing_accessibility_report
 distribution:
   - ce
   - ee
diff --git a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
index 44597d4910b..847f615e166 100644
--- a/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
+++ b/config/metrics/counts_7d/20210413205507_i_testing_summary_widget_total_weekly.yml
@@ -12,6 +12,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59316
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_testing_summary_widget_total
 distribution:
 - ee
 - ce