Merge branch '333117-migrate-events-redishll' into 'master'

Resolve "Migrate RedisHLL metrics to instrumentation classes" See merge request gitlab-org/gitlab!67820

Merge branch '333117-migrate-events-redishll' into 'master'
Resolve "Migrate RedisHLL metrics to instrumentation classes" See merge request gitlab-org/gitlab!67820
06fcfe71 · Alper Akgun · 1e214a79 · 45c611bd · 06fcfe71 · 06fcfe71
Commit 06fcfe71 authored Aug 13, 2021 by Alper Akgun
225 changed files
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_analytics_pipelines
 distribution:
 - ce
 tier:

--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_analytics_valuestream
 distribution:
 - ce
 tier:

--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_analytics_cohorts
 distribution:
 - ce
 tier:

--- a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
+++ b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_analytics_dev_ops_score
 distribution:
 - ce
 tier:

--- a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.g_analytics_merge_request_monthly
-description: 
+description:
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: removed
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_analytics_merge_request
 distribution:
 - ce
 tier:

--- a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
+++ b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_analytics_instance_statistics
 distribution:
 - ce
 tier:

--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -5,11 +5,31 @@ description: The number of unique users who visited any analytics feature by mon
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 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
 distribution:
 - ce
 tier:

--- a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
+++ b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_snippets_show
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_auto_devops
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_auto_devops_build
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_auto_devops_deploy
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_security_sast
 distribution:
 - ce
 tier:

--- a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_security_secret_detection
 distribution:
 - ce
 tier:

--- a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_5_min_production_app
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_auto_devops
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_aws_cf_deploy_ec2
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_aws_deploy_ecs
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_auto_devops_build
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_auto_devops_deploy
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_auto_devops_deploy_latest
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_security_sast
 distribution:
 - ce
 tier:

--- a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_security_secret_detection
 distribution:
 - ce
 tier:

--- a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_terraform_base_latest
 distribution:
 - ce
 - ee

--- 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
@@ -11,6 +11,24 @@ status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332466
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_auto_devops
+    - p_ci_templates_implicit_auto_devops_build
+    - p_ci_templates_implicit_auto_devops_deploy
+    - p_ci_templates_implicit_security_sast
+    - p_ci_templates_implicit_security_secret_detection
+    - p_ci_templates_5_min_production_app
+    - p_ci_templates_auto_devops
+    - p_ci_templates_aws_cf_deploy_ec2
+    - p_ci_templates_aws_deploy_ecs
+    - p_ci_templates_auto_devops_build
+    - p_ci_templates_auto_devops_deploy
+    - p_ci_templates_auto_devops_deploy_latest
+    - p_ci_templates_security_sast
+    - p_ci_templates_security_secret_detection
+    - p_ci_templates_terraform_base_latest
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_conan_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_container_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_debian_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
@@ -11,6 +11,10 @@ status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331455
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_generic_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_golang_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_maven_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_npm_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_nuget_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_pypi_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_tag_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
@@ -10,6 +10,23 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_deploy_token
+    - i_package_conan_deploy_token
+    - i_package_container_deploy_token
+    - i_package_debian_deploy_token
+    - i_package_generic_deploy_token
+    - i_package_golang_deploy_token
+    - i_package_helm_deploy_token
+    - i_package_maven_deploy_token
+    - i_package_npm_deploy_token
+    - i_package_nuget_deploy_token
+    - i_package_pypi_deploy_token
+    - i_package_rubygems_deploy_token
+    - i_package_tag_deploy_token
+    - i_package_terraform_module_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_conan_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_container_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_debian_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
@@ -11,6 +11,10 @@ status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331455
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_generic_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_golang_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_maven_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_npm_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_nuget_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_pypi_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_tag_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
@@ -10,6 +10,23 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_user
+    - i_package_conan_user
+    - i_package_container_user
+    - i_package_debian_user
+    - i_package_generic_user
+    - i_package_golang_user
+    - i_package_helm_user
+    - i_package_maven_user
+    - i_package_npm_user
+    - i_package_nuget_user
+    - i_package_pypi_user
+    - i_package_rubygems_user
+    - i_package_tag_user
+    - i_package_terraform_module_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_jira_service_close_issue
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
+++ b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_jira_service_cross_reference
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
@@ -10,6 +10,22 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_jira_service_close_issue
+    - i_ecosystem_jira_service_cross_reference
+    - i_ecosystem_jira_service_list_issues
+    - i_ecosystem_jira_service_create_issue
+    - i_ecosystem_slack_service_issue_notification
+    - i_ecosystem_slack_service_push_notification
+    - i_ecosystem_slack_service_deployment_notification
+    - i_ecosystem_slack_service_wiki_page_notification
+    - i_ecosystem_slack_service_merge_request_notification
+    - i_ecosystem_slack_service_note_notification
+    - i_ecosystem_slack_service_tag_push_notification
+    - i_ecosystem_slack_service_confidential_note_notification
+    - i_ecosystem_slack_service_confidential_issue_notification
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150507_i_ecosystem_slack_service_issue_notification_monthly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_issue_notification
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150654_i_ecosystem_slack_service_push_notification_monthly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_push_notification
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303150912_i_ecosystem_slack_service_deployment_notification_monthly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_deployment_notification
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151609_i_ecosystem_slack_service_wiki_page_notification_monthly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_wiki_page_notification
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151831_i_ecosystem_slack_service_merge_request_notification_monthly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_merge_request_notification
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303151946_i_ecosystem_slack_service_note_notification_monthly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_note_notification
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152049_i_ecosystem_slack_service_tag_push_notification_monthly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_tag_push_notification
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152144_i_ecosystem_slack_service_confidential_note_notification_monthly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_confidential_note_notification
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
+++ b/config/metrics/counts_28d/20210303152233_i_ecosystem_slack_service_confidential_issue_notification_monthly.yml
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_confidential_issue_notification
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210303154626_i_package_rubygems_deploy_token_monthly.yml
@@ -12,6 +12,10 @@ milestone: '13.10'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53480
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_rubygems_deploy_token
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
+++ b/config/metrics/counts_28d/20210303154654_i_package_rubygems_user_monthly.yml
@@ -12,6 +12,10 @@ milestone: '13.10'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53480
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_rubygems_user
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210410012206_i_package_terraform_module_deploy_token_monthly.yml
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_terraform_module_deploy_token
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
+++ b/config/metrics/counts_28d/20210410012208_i_package_terraform_module_user_monthly.yml
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_terraform_module_user
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210517074859_i_package_helm_deploy_token_monthly.yml
@@ -12,6 +12,10 @@ milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61014
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_helm_deploy_token
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210517075259_i_package_helm_user_monthly.yml
@@ -12,6 +12,10 @@ milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61014
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_helm_user
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
+++ b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_analytics_instance_statistics
 distribution:
 - ee
 tier: []

--- a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -10,6 +10,26 @@ value_type: number
 status: data_available
 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
 distribution:
 - ee
 tier: []

--- a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
+++ b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_snippets_show
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_5_min_production_app
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_aws_cf_deploy_ec2
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_aws_deploy_ecs
 distribution:
 - ce
 - ee

--- 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
@@ -11,6 +11,24 @@ status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/332466
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_implicit_auto_devops
+    - p_ci_templates_implicit_auto_devops_build
+    - p_ci_templates_implicit_auto_devops_deploy
+    - p_ci_templates_implicit_security_sast
+    - p_ci_templates_implicit_security_secret_detection
+    - p_ci_templates_5_min_production_app
+    - p_ci_templates_auto_devops
+    - p_ci_templates_aws_cf_deploy_ec2
+    - p_ci_templates_aws_deploy_ecs
+    - p_ci_templates_auto_devops_build
+    - p_ci_templates_auto_devops_deploy
+    - p_ci_templates_auto_devops_deploy_latest
+    - p_ci_templates_security_sast
+    - p_ci_templates_security_secret_detection
+    - p_ci_templates_terraform_base_latest
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_conan_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_container_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_debian_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_generic_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_golang_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_maven_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_npm_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_nuget_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_pypi_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_tag_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -10,6 +10,23 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_deploy_token
+    - i_package_conan_deploy_token
+    - i_package_container_deploy_token
+    - i_package_debian_deploy_token
+    - i_package_generic_deploy_token
+    - i_package_golang_deploy_token
+    - i_package_helm_deploy_token
+    - i_package_maven_deploy_token
+    - i_package_npm_deploy_token
+    - i_package_nuget_deploy_token
+    - i_package_pypi_deploy_token
+    - i_package_rubygems_deploy_token
+    - i_package_tag_deploy_token
+    - i_package_terraform_module_deploy_token
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_conan_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_container_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_debian_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
@@ -11,6 +11,10 @@ status: broken
 repair_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/331455
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_generic_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_golang_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_maven_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_npm_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_nuget_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_pypi_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: deprecated
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_tag_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
@@ -10,6 +10,23 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_composer_user
+    - i_package_conan_user
+    - i_package_container_user
+    - i_package_debian_user
+    - i_package_generic_user
+    - i_package_golang_user
+    - i_package_helm_user
+    - i_package_maven_user
+    - i_package_npm_user
+    - i_package_nuget_user
+    - i_package_pypi_user
+    - i_package_rubygems_user
+    - i_package_tag_user
+    - i_package_terraform_module_user
 distribution:
 - ee
 - ce

--- a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_jira_service_close_issue
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
+++ b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_jira_service_cross_reference
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
@@ -10,6 +10,22 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_jira_service_close_issue
+    - i_ecosystem_jira_service_cross_reference
+    - i_ecosystem_jira_service_list_issues
+    - i_ecosystem_jira_service_create_issue
+    - i_ecosystem_slack_service_issue_notification
+    - i_ecosystem_slack_service_push_notification
+    - i_ecosystem_slack_service_deployment_notification
+    - i_ecosystem_slack_service_wiki_page_notification
+    - i_ecosystem_slack_service_merge_request_notification
+    - i_ecosystem_slack_service_note_notification
+    - i_ecosystem_slack_service_tag_push_notification
+    - i_ecosystem_slack_service_confidential_note_notification
+    - i_ecosystem_slack_service_confidential_issue_notification
 distribution:
 - ce
 - ee

--- a/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103002_i_ecosystem_slack_service_issue_notification_weekly.yml
--- a/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103629_i_ecosystem_slack_service_push_notification_weekly.yml
--- a/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103755_i_ecosystem_slack_service_deployment_notification_weekly.yml
--- a/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302103907_i_ecosystem_slack_service_wiki_page_notification_weekly.yml
--- a/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104007_i_ecosystem_slack_service_merge_request_notification_weekly.yml
--- a/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104047_i_ecosystem_slack_service_note_notification_weekly.yml
--- a/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104144_i_ecosystem_slack_service_tag_push_notification_weekly.yml
--- a/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104556_i_ecosystem_slack_service_confidential_note_notification_weekly.yml
--- a/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
+++ b/config/metrics/counts_7d/20210302104814_i_ecosystem_slack_service_confidential_issue_notification_weekly.yml
--- a/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210303154624_i_package_rubygems_deploy_token_weekly.yml
--- a/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
+++ b/config/metrics/counts_7d/20210303154652_i_package_rubygems_user_weekly.yml
--- a/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210410012207_i_package_terraform_module_deploy_token_weekly.yml
--- a/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
+++ b/config/metrics/counts_7d/20210410012209_i_package_terraform_module_user_weekly.yml
--- a/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210517074851_i_package_helm_deploy_token_weekly.yml
--- a/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210517075252_i_package_helm_user_weekly.yml
--- a/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
--- a/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
--- a/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
--- a/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
--- a/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
--- a/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
--- a/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
--- a/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
--- a/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
--- a/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
--- a/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
--- a/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
--- a/ee/config/metrics/counts_28d/20210305144719_g_product_planning_epic_created_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210305144719_g_product_planning_epic_created_monthly.yml
--- a/ee/config/metrics/counts_28d/20210310163213_g_project_management_epic_closed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210310163213_g_project_management_epic_closed_monthly.yml
--- a/ee/config/metrics/counts_28d/20210310164247_g_project_management_epic_reopened_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210310164247_g_project_management_epic_reopened_monthly.yml
--- a/ee/config/metrics/counts_28d/20210310203049_g_project_management_epic_confidential_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210310203049_g_project_management_epic_confidential_monthly.yml
--- a/ee/config/metrics/counts_28d/20210312093611_g_project_management_epic_visible_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210312093611_g_project_management_epic_visible_monthly.yml
--- a/ee/config/metrics/counts_28d/20210312101935_g_project_management_users_updating_epic_titles_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210312101935_g_project_management_users_updating_epic_titles_monthly.yml
--- a/ee/config/metrics/counts_28d/20210312102051_g_project_management_users_updating_epic_descriptions_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210312102051_g_project_management_users_updating_epic_descriptions_monthly.yml
--- a/ee/config/metrics/counts_28d/20210312144719_g_product_planning_epic_issue_added_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210312144719_g_product_planning_epic_issue_added_monthly.yml
--- a/ee/config/metrics/counts_28d/20210312195730_g_project_management_epic_labels_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210312195730_g_project_management_epic_labels_monthly.yml
--- a/ee/config/metrics/counts_28d/20210314215451_g_project_management_users_creating_epic_notes_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210314215451_g_project_management_users_creating_epic_notes_monthly.yml
--- a/ee/config/metrics/counts_28d/20210314234202_g_project_management_users_updating_epic_notes_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210314234202_g_project_management_users_updating_epic_notes_monthly.yml
--- a/ee/config/metrics/counts_28d/20210315034808_g_project_management_users_destroying_epic_notes_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210315034808_g_project_management_users_destroying_epic_notes_monthly.yml
--- a/ee/config/metrics/counts_28d/20210315055439_g_project_management_users_setting_epic_start_date_as_inherited_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210315055439_g_project_management_users_setting_epic_start_date_as_inherited_monthly.yml
--- a/ee/config/metrics/counts_28d/20210315055624_g_project_management_users_setting_epic_start_date_as_fixed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210315055624_g_project_management_users_setting_epic_start_date_as_fixed_monthly.yml
--- a/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml
--- a/ee/config/metrics/counts_28d/20210325060315_g_project_management_users_setting_epic_due_date_as_inherited_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210325060315_g_project_management_users_setting_epic_due_date_as_inherited_monthly.yml
--- a/ee/config/metrics/counts_28d/20210325060507_g_project_management_users_setting_epic_due_date_as_fixed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210325060507_g_project_management_users_setting_epic_due_date_as_fixed_monthly.yml
--- a/ee/config/metrics/counts_28d/20210329043509_g_project_management_users_updating_fixed_epic_start_date_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210329043509_g_project_management_users_updating_fixed_epic_start_date_monthly.yml
--- a/ee/config/metrics/counts_28d/20210329043548_g_project_management_users_updating_fixed_epic_due_date_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210329043548_g_project_management_users_updating_fixed_epic_due_date_monthly.yml
--- a/ee/config/metrics/counts_28d/20210331193236_g_project_management_issue_promoted_to_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210331193236_g_project_management_issue_promoted_to_epic_monthly.yml
--- a/ee/config/metrics/counts_28d/20210401092244_i_analytics_dev_ops_adoption_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210401092244_i_analytics_dev_ops_adoption_monthly.yml
--- a/ee/config/metrics/counts_28d/20210401183230_g_project_management_epic_issue_removed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210401183230_g_project_management_epic_issue_removed_monthly.yml
--- a/ee/config/metrics/counts_28d/20210405190240_g_project_management_epic_issue_moved_from_project_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210405190240_g_project_management_epic_issue_moved_from_project_monthly.yml
--- a/ee/config/metrics/counts_28d/20210413174710_g_project_management_epic_destroyed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210413174710_g_project_management_epic_destroyed_monthly.yml
--- a/ee/config/metrics/counts_28d/20210419105414_users_viewing_analytics_group_devops_adoption_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210419105414_users_viewing_analytics_group_devops_adoption_monthly.yml
--- a/ee/config/metrics/counts_28d/20210421080207_g_project_management_users_checking_epic_task_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210421080207_g_project_management_users_checking_epic_task_monthly.yml
--- a/ee/config/metrics/counts_28d/20210421102516_g_project_management_users_unchecking_epic_task_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210421102516_g_project_management_users_unchecking_epic_task_monthly.yml
--- a/ee/config/metrics/counts_28d/20210423011841_g_project_management_users_updating_epic_parent_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210423011841_g_project_management_users_updating_epic_parent_monthly.yml
--- a/ee/config/metrics/counts_28d/20210430174100_g_project_management_epic_cross_referenced_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210430174100_g_project_management_epic_cross_referenced_monthly.yml
--- a/ee/config/metrics/counts_28d/20210503011217_g_project_management_users_awarding_epic_emoji_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210503011217_g_project_management_users_awarding_epic_emoji_monthly.yml
--- a/ee/config/metrics/counts_28d/20210505071850_g_project_management_users_removing_epic_emoji_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210505071850_g_project_management_users_removing_epic_emoji_monthly.yml
--- a/ee/config/metrics/counts_28d/20210608191652_g_project_management_users_epic_issue_added_from_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210608191652_g_project_management_users_epic_issue_added_from_epic_monthly.yml
--- a/ee/config/metrics/counts_28d/20210623202402_clusters_using_network_policies_ui_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210623202402_clusters_using_network_policies_ui_monthly.yml
--- a/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
--- a/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
--- a/ee/config/metrics/counts_7d/20210305145820_g_product_planning_epic_created_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210305145820_g_product_planning_epic_created_weekly.yml
--- a/ee/config/metrics/counts_7d/20210310162703_g_project_management_epic_closed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210310162703_g_project_management_epic_closed_weekly.yml
--- a/ee/config/metrics/counts_7d/20210310164112_g_project_management_epic_reopened_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210310164112_g_project_management_epic_reopened_weekly.yml
--- a/ee/config/metrics/counts_7d/20210310203225_g_project_management_epic_confidential_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210310203225_g_project_management_epic_confidential_weekly.yml
--- a/ee/config/metrics/counts_7d/20210312093243_g_poject_management_epic_visible_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210312093243_g_poject_management_epic_visible_weekly.yml
--- a/ee/config/metrics/counts_7d/20210312101753_g_project_management_users_updating_epic_descriptions_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210312101753_g_project_management_users_updating_epic_descriptions_weekly.yml
--- a/ee/config/metrics/counts_7d/20210312101826_g_project_management_users_updating_epic_titles_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210312101826_g_project_management_users_updating_epic_titles_weekly.yml
--- a/ee/config/metrics/counts_7d/20210312181918_g_product_planning_epic_issue_added_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210312181918_g_product_planning_epic_issue_added_weekly.yml
--- a/ee/config/metrics/counts_7d/20210312195849_g_project_management_epic_labels_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210312195849_g_project_management_epic_labels_weekly.yml
--- a/ee/config/metrics/counts_7d/20210314231518_g_project_management_users_creating_epic_notes_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210314231518_g_project_management_users_creating_epic_notes_weekly.yml
--- a/ee/config/metrics/counts_7d/20210314234041_g_project_management_users_updating_epic_notes_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210314234041_g_project_management_users_updating_epic_notes_weekly.yml
--- a/ee/config/metrics/counts_7d/20210315034846_g_project_management_users_destroying_epic_notes_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210315034846_g_project_management_users_destroying_epic_notes_weekly.yml
--- a/ee/config/metrics/counts_7d/20210315054905_g_project_management_users_setting_epic_start_date_as_fixed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210315054905_g_project_management_users_setting_epic_start_date_as_fixed_weekly.yml
--- a/ee/config/metrics/counts_7d/20210315055342_g_project_management_users_setting_epic_start_date_as_inherited_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210315055342_g_project_management_users_setting_epic_start_date_as_inherited_weekly.yml
--- a/ee/config/metrics/counts_7d/20210318183220_epics_usage_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210318183220_epics_usage_total_unique_counts_weekly.yml
--- a/ee/config/metrics/counts_7d/20210325060623_g_project_management_users_setting_epic_due_date_as_fixed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210325060623_g_project_management_users_setting_epic_due_date_as_fixed_weekly.yml
--- a/ee/config/metrics/counts_7d/20210325060903_g_project_management_users_setting_epic_due_date_as_inherited_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210325060903_g_project_management_users_setting_epic_due_date_as_inherited_weekly.yml
--- a/ee/config/metrics/counts_7d/20210329042536_g_project_management_users_updating_fixed_epic_due_date_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210329042536_g_project_management_users_updating_fixed_epic_due_date_weekly.yml
--- a/ee/config/metrics/counts_7d/20210329043402_g_project_management_users_updating_fixed_epic_start_date_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210329043402_g_project_management_users_updating_fixed_epic_start_date_weekly.yml
--- a/ee/config/metrics/counts_7d/20210331192332_g_project_management_issue_promoted_to_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210331192332_g_project_management_issue_promoted_to_epic_weekly.yml
--- a/ee/config/metrics/counts_7d/20210401092244_i_analytics_dev_ops_adoption_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210401092244_i_analytics_dev_ops_adoption_weekly.yml
--- a/ee/config/metrics/counts_7d/20210401182457_g_project_management_g_project_management_epic_issue_removed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210401182457_g_project_management_g_project_management_epic_issue_removed_weekly.yml
--- a/ee/config/metrics/counts_7d/20210405185814_g_project_management_epic_issue_moved_from_project_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210405185814_g_project_management_epic_issue_moved_from_project_weekly.yml
--- a/ee/config/metrics/counts_7d/20210413174449_g_project_management_epic_destroyed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210413174449_g_project_management_epic_destroyed_weekly.yml
--- a/ee/config/metrics/counts_7d/20210419105408_users_viewing_analytics_group_devops_adoption_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210419105408_users_viewing_analytics_group_devops_adoption_weekly.yml
--- a/ee/config/metrics/counts_7d/20210421075943_g_project_management_users_checking_epic_task_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210421075943_g_project_management_users_checking_epic_task_weekly.yml
--- a/ee/config/metrics/counts_7d/20210421102812_g_project_management_users_unchecking_epic_task_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210421102812_g_project_management_users_unchecking_epic_task_weekly.yml
--- a/ee/config/metrics/counts_7d/20210423012053_g_project_management_users_updating_epic_parent_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210423012053_g_project_management_users_updating_epic_parent_weekly.yml
--- a/ee/config/metrics/counts_7d/20210430173650_g_project_management_epic_cross_referenced_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210430173650_g_project_management_epic_cross_referenced_weekly.yml
--- a/ee/config/metrics/counts_7d/20210503011355_g_project_management_users_awarding_epic_emoji_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210503011355_g_project_management_users_awarding_epic_emoji_weekly.yml
--- a/ee/config/metrics/counts_7d/20210505071932_g_project_management_users_removing_epic_emoji_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210505071932_g_project_management_users_removing_epic_emoji_weekly.yml
--- a/ee/config/metrics/counts_7d/20210608191647_g_project_management_users_epic_issue_added_from_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210608191647_g_project_management_users_epic_issue_added_from_epic_weekly.yml
--- a/ee/config/metrics/counts_7d/20210623202358_clusters_using_network_policies_ui_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210623202358_clusters_using_network_policies_ui_weekly.yml
--- a/ee/spec/lib/gitlab/usage_data_metrics_spec.rb
+++ b/ee/spec/lib/gitlab/usage_data_metrics_spec.rb
--- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb
+++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
--- a/spec/lib/gitlab/usage_data_metrics_spec.rb
+++ b/spec/lib/gitlab/usage_data_metrics_spec.rb