Resolve "Migrate RedisHLL metrics to instrumentation classes"

45c611bd · Luis Mejia · Alper Akgun · 11f38168 · 45c611bd · 45c611bd
Commit 45c611bd authored Aug 13, 2021 by Luis Mejia Committed by Alper Akgun Aug 13, 2021
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
@@ -10,6 +10,10 @@ 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
@@ -10,6 +10,26 @@ 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
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_issue_notification
 distribution:
 - ee
 - ce

--- 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
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_push_notification
 distribution:
 - ee
 - ce

--- 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
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_deployment_notification
 distribution:
 - ee
 - ce

--- 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
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_wiki_page_notification
 distribution:
 - ee
 - ce

--- 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
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_merge_request_notification
 distribution:
 - ee
 - ce

--- 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
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_note_notification
 distribution:
 - ee
 - ce

--- 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
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_tag_push_notification
 distribution:
 - ee
 - ce

--- 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
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_confidential_note_notification
 distribution:
 - ee
 - ce

--- 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
@@ -12,6 +12,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/54347
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_ecosystem_slack_service_confidential_issue_notification
 distribution:
 - ee
 - ce

--- 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
@@ -12,6 +12,10 @@ milestone: '13.10'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53480
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_rubygems_deploy_token
 distribution:
 - ce
 - ee

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

--- 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
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_terraform_module_deploy_token
 distribution:
 - ce
 - ee

--- 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
@@ -12,6 +12,10 @@ milestone: '13.11'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55018
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_terraform_module_user
 distribution:
 - ce
 - ee

--- 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
@@ -12,6 +12,10 @@ milestone: "14.0"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61014
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_package_helm_deploy_token
 distribution:
 - ce
 - ee

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

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

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

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

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

--- a/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174929_g_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:
+    - g_analytics_valuestream
 distribution:
 - ce
 tier:

--- 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
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_analytics_code_reviews
 distribution:
 - ce
 tier:

--- a/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_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_insights
 distribution:
 - ce
 tier:

--- a/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_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_issues
 distribution:
 - ce
 tier:

--- a/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_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_repo
 distribution:
 - ce
 tier:

--- 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
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_analytics_merge_request
 distribution:
 - ce
 tier:

--- 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
@@ -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_list_issues
 distribution:
 - ee
 tier:

--- 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
@@ -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_create_issue
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53651
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_created
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56246
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_closed
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56246
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_reopened
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56246
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_setting_epic_confidential
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56246
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_setting_epic_visible
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56489
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_epic_titles
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56489
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_epic_descriptions
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56559
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_issue_added
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56571
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_users_changing_labels
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56609
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_creating_epic_notes
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56610
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_epic_notes
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56617
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_destroying_epic_notes
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56619
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_setting_epic_start_date_as_inherited
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56619
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_setting_epic_start_date_as_fixed
 distribution:
 - ee
 tier:

--- 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
@@ -12,6 +12,38 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56891
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_created
+    - project_management_users_unchecking_epic_task
+    - project_management_users_checking_epic_task
+    - g_project_management_users_updating_epic_titles
+    - g_project_management_users_updating_epic_descriptions
+    - g_project_management_users_creating_epic_notes
+    - g_project_management_users_updating_epic_notes
+    - g_project_management_users_destroying_epic_notes
+    - g_project_management_users_awarding_epic_emoji
+    - g_project_management_users_removing_epic_emoji
+    - g_project_management_users_setting_epic_start_date_as_fixed
+    - g_project_management_users_updating_fixed_epic_start_date
+    - g_project_management_users_setting_epic_start_date_as_inherited
+    - g_project_management_users_setting_epic_due_date_as_fixed
+    - g_project_management_users_updating_fixed_epic_due_date
+    - g_project_management_users_setting_epic_due_date_as_inherited
+    - g_project_management_epic_issue_added
+    - g_project_management_epic_issue_removed
+    - g_project_management_epic_issue_moved_from_project
+    - g_project_management_users_updating_epic_parent
+    - g_project_management_epic_closed
+    - g_project_management_epic_reopened
+    - 'g_project_management_issue_promoted_to_epic'
+    - g_project_management_users_setting_epic_confidential
+    - g_project_management_users_setting_epic_visible
+    - g_project_management_epic_users_changing_labels
+    - g_project_management_epic_destroyed
+    - g_project_management_epic_cross_referenced
+    - g_project_management_users_epic_issue_added_from_epic
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57457
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_setting_epic_due_date_as_inherited
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57457
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_setting_epic_due_date_as_fixed
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57672
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_fixed_epic_start_date
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57672
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_fixed_epic_due_date
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56706
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_promoted_to_epic
 distribution:
 - ee
 tier:

--- 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
@@ -13,6 +13,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57104
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_analytics_dev_ops_adoption
 distribution:
  - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58426
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_issue_removed
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58590
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_issue_moved_from_project
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59185
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_destroyed
 distribution:
 - ee
 tier:

--- 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
@@ -12,6 +12,10 @@ milestone: "13.12"
 introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59738"
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_viewing_analytics_group_devops_adoption
 distribution:
  - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.12"
 introduced_by_url:
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - project_management_users_checking_epic_task
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59871
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - project_management_users_unchecking_epic_task
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60079
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_epic_parent
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59804
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_cross_referenced
 distribution:
 - ee
 tier:

--- 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
@@ -12,6 +12,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60787
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_awarding_epic_emoji
 distribution:
 - ee
 tier:

--- 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
@@ -12,6 +12,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60989
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_removing_epic_emoji
 distribution:
 - ee
 tier:

--- 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
@@ -12,6 +12,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61822
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_epic_issue_added_from_epic
 distribution:
 - ee
 tier:

--- 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
@@ -12,6 +12,10 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64731
 time_frame: 28d
 data_source: redis_hll
 data_category: operational
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - clusters_using_network_policies_ui
 distribution:
 - ee
 tier:

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

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

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

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

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

--- a/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_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_analytics_pipelines
 distribution:
 - ee
 tier: []

--- 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
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_analytics_code_reviews
 distribution:
 - ee
 tier: []

--- a/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_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_analytics_valuestream
 distribution:
 - ee
 tier: []

--- a/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_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_analytics_insights
 distribution:
 - ee
 tier: []

--- a/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_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_analytics_issues
 distribution:
 - ee
 tier: []

--- a/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_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_analytics_repo
 distribution:
 - ee
 tier: []

--- a/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_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_cohorts
 distribution:
 - ee
 tier: []

--- 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
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_analytics_dev_ops_score
 distribution:
 - ee
 tier: []

--- 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
@@ -10,6 +10,10 @@ value_type: number
 status: removed
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_analytics_merge_request
 distribution:
 - ee
 tier: []

--- 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
@@ -10,6 +10,10 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_analytics_merge_request
 distribution:
 - ee
 tier: []

--- 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
@@ -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_implicit_auto_devops
 distribution:
 - ee
 tier: []

--- 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
@@ -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_implicit_auto_devops_build
 distribution:
 - ee
 tier: []

--- 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
@@ -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_implicit_auto_devops_deploy
 distribution:
 - ee
 tier: []

--- 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
@@ -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_implicit_security_sast
 distribution:
 - ee
 tier: []

--- 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
@@ -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_implicit_security_secret_detection
 distribution:
 - ee
 tier: []

--- 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
@@ -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_auto_devops
 distribution:
 - ee
 tier: []

--- 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
@@ -10,6 +10,14 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_auto_devops_build
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_auto_devops
 distribution:
 - ee
 tier: []

--- 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
@@ -10,6 +10,14 @@ value_type: number
 status: data_available
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_auto_devops_deploy
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - p_ci_templates_auto_devops
 distribution:
 - ee
 tier: []

--- 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
@@ -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_auto_devops_deploy_latest
 distribution:
 - ee
 tier: []

--- 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
@@ -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_security_sast
 distribution:
 - ee
 tier: []

--- 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
@@ -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_security_secret_detection
 distribution:
 - ee
 tier: []

--- 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
@@ -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_terraform_base_latest
 distribution:
 - ee
 tier: []

--- 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
@@ -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_list_issues
 distribution:
 - ee
 tier:

--- 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
@@ -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_create_issue
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53651
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_created
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56246
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_closed
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56246
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_reopened
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56246
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_setting_epic_confidential
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56246
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_setting_epic_visible
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56489
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_epic_descriptions
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56489
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_epic_titles
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56559
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_issue_added
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56571
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_users_changing_labels
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.10"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56609
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_creating_epic_notes
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56610
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_epic_notes
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56617
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_destroying_epic_notes
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56619
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_setting_epic_start_date_as_fixed
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56619
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_setting_epic_start_date_as_inherited
 distribution:
 - ee
 tier:

--- 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
@@ -12,6 +12,38 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56891
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_created
+    - project_management_users_unchecking_epic_task
+    - project_management_users_checking_epic_task
+    - g_project_management_users_updating_epic_titles
+    - g_project_management_users_updating_epic_descriptions
+    - g_project_management_users_creating_epic_notes
+    - g_project_management_users_updating_epic_notes
+    - g_project_management_users_destroying_epic_notes
+    - g_project_management_users_awarding_epic_emoji
+    - g_project_management_users_removing_epic_emoji
+    - g_project_management_users_setting_epic_start_date_as_fixed
+    - g_project_management_users_updating_fixed_epic_start_date
+    - g_project_management_users_setting_epic_start_date_as_inherited
+    - g_project_management_users_setting_epic_due_date_as_fixed
+    - g_project_management_users_updating_fixed_epic_due_date
+    - g_project_management_users_setting_epic_due_date_as_inherited
+    - g_project_management_epic_issue_added
+    - g_project_management_epic_issue_removed
+    - g_project_management_epic_issue_moved_from_project
+    - g_project_management_users_updating_epic_parent
+    - g_project_management_epic_closed
+    - g_project_management_epic_reopened
+    - 'g_project_management_issue_promoted_to_epic'
+    - g_project_management_users_setting_epic_confidential
+    - g_project_management_users_setting_epic_visible
+    - g_project_management_epic_users_changing_labels
+    - g_project_management_epic_destroyed
+    - g_project_management_epic_cross_referenced
+    - g_project_management_users_epic_issue_added_from_epic
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57457
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_setting_epic_due_date_as_fixed
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57457
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_setting_epic_due_date_as_inherited
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57672
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_fixed_epic_due_date
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57672
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_fixed_epic_start_date
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56706
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_issue_promoted_to_epic
 distribution:
 - ee
 tier:

--- 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
@@ -14,6 +14,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57104
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - i_analytics_dev_ops_adoption
 distribution:
  - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58426
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_issue_removed
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58590
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_issue_moved_from_project
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.11"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59185
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_destroyed
 distribution:
 - ee
 tier:

--- 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
@@ -12,6 +12,10 @@ milestone: "13.12"
 introduced_by_url: "https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59738"
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_viewing_analytics_group_devops_adoption
 distribution:
  - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59871
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - project_management_users_checking_epic_task
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59871
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - project_management_users_unchecking_epic_task
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60079
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_updating_epic_parent
 distribution:
 - ee
 tier:

--- 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
@@ -15,6 +15,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59804
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_epic_cross_referenced
 distribution:
 - ee
 tier:

--- 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
@@ -12,6 +12,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60787
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_awarding_epic_emoji
 distribution:
 - ee
 tier:

--- 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
@@ -12,6 +12,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60989
 time_frame: 28d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_removing_epic_emoji
 distribution:
 - ee
 tier:

--- 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
@@ -12,6 +12,10 @@ milestone: "13.12"
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61822
 time_frame: 7d
 data_source: redis_hll
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - g_project_management_users_epic_issue_added_from_epic
 distribution:
 - ee
 tier:

--- 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
@@ -12,6 +12,10 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64731
 time_frame: 7d
 data_source: redis_hll
 data_category: operational
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - clusters_using_network_policies_ui
 distribution:
 - ee
 tier:

--- a/ee/spec/lib/gitlab/usage_data_metrics_spec.rb
+++ b/ee/spec/lib/gitlab/usage_data_metrics_spec.rb
@@ -22,98 +22,37 @@ RSpec.describe Gitlab::UsageDataMetrics do
        expect(subject).to include(:license_subscription_id)
      end

-      it 'includes incident_management_incident_published monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:incident_management]).to include(
-          :incident_management_incident_published_monthly, :incident_management_incident_published_weekly
-        )
+      describe 'Redis_HLL_counters' do
+        let(:metric_files_key_paths) do
+          Gitlab::Usage::MetricDefinition
+            .definitions
+            .select { |k, v| v.attributes[:data_source] == 'redis_hll' && v.key_path.starts_with?('redis_hll_counters') }
+            .keys
+            .sort
        end

-      it 'includes incident_management_oncall monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:incident_management_oncall].keys).to contain_exactly(*[
-          :i_incident_management_oncall_notification_sent_monthly, :i_incident_management_oncall_notification_sent_weekly
-        ])
+        # Recursively traverse nested Hash of a generated Service Ping to return an Array of key paths
+        # in the dotted format used in metric definition YAML files, e.g.: 'count.category.metric_name'
+        def parse_service_ping_keys(object, key_path = [])
+          if object.is_a?(Hash)
+            object.each_with_object([]) do |(key, value), result|
+              result.append parse_service_ping_keys(value, key_path + [key])
            end
-
-      it 'includes compliance monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:compliance].keys).to contain_exactly(*[
-          :g_compliance_dashboard_monthly, :g_compliance_dashboard_weekly,
-          :g_compliance_audit_events_monthly, :g_compliance_audit_events_weekly,
-          :i_compliance_audit_events_monthly, :i_compliance_audit_events_weekly,
-          :i_compliance_credential_inventory_monthly, :i_compliance_credential_inventory_weekly,
-          :a_compliance_audit_events_api_monthly, :a_compliance_audit_events_api_weekly,
-          :compliance_total_unique_counts_monthly, :compliance_total_unique_counts_weekly
-        ])
+          else
+            key_path.join('.')
          end
-
-      it 'includes search monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:search].keys).to contain_exactly(*[
-          :i_search_total_monthly, :i_search_total_weekly,
-          :i_search_advanced_monthly, :i_search_advanced_weekly,
-          :i_search_paid_monthly, :i_search_paid_weekly,
-          :search_total_unique_counts_monthly, :search_total_unique_counts_weekly
-        ])
        end

-      it 'includes i_ci_secrets_management_vault_build_created monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:ci_secrets_management].keys).to contain_exactly(*[
-          :i_ci_secrets_management_vault_build_created_monthly, :i_ci_secrets_management_vault_build_created_weekly
-        ])
+        let(:service_ping_key_paths) do
+          parse_service_ping_keys(subject)
+            .flatten
+            .select { |k| k.starts_with?('redis_hll_counters') }
+            .sort
        end

-      it 'includes epic_boards_usage monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:epic_boards_usage].keys).to contain_exactly(*[
-          :g_project_management_users_creating_epic_boards_monthly, :g_project_management_users_creating_epic_boards_weekly,
-          :g_project_management_users_viewing_epic_boards_monthly, :g_project_management_users_viewing_epic_boards_weekly,
-          :g_project_management_users_updating_epic_board_names_monthly, :g_project_management_users_updating_epic_board_names_weekly,
-          :epic_boards_usage_total_unique_counts_monthly, :epic_boards_usage_total_unique_counts_weekly
-        ])
+        it 'is included in the Usage Ping hash structure' do
+          expect(metric_files_key_paths).to match_array(service_ping_key_paths)
        end
-
-      it 'includes terraform weekly key' do
-        expect(subject[:redis_hll_counters][:terraform].keys).to include(:p_terraform_state_api_unique_users_weekly)
-      end
-
-      it 'includes issues_edit monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:issues_edit].keys).to include(
-          :g_project_management_issue_iteration_changed_monthly, :g_project_management_issue_iteration_changed_weekly,
-          :g_project_management_issue_weight_changed_monthly, :g_project_management_issue_weight_changed_weekly,
-          :g_project_management_issue_added_to_epic_monthly, :g_project_management_issue_added_to_epic_weekly,
-          :g_project_management_issue_removed_from_epic_monthly, :g_project_management_issue_removed_from_epic_weekly,
-          :g_project_management_issue_changed_epic_monthly, :g_project_management_issue_changed_epic_weekly,
-          :g_project_management_issue_health_status_changed_monthly, :g_project_management_issue_health_status_changed_weekly
-        )
-      end
-
-      it 'includes testing monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:testing]).to include(
-          :i_testing_metrics_report_widget_total_monthly, :i_testing_metrics_report_widget_total_weekly,
-          :i_testing_group_code_coverage_visit_total_monthly, :i_testing_group_code_coverage_visit_total_weekly,
-          :i_testing_full_code_quality_report_total_monthly, :i_testing_full_code_quality_report_total_weekly,
-          :i_testing_web_performance_widget_total_monthly, :i_testing_web_performance_widget_total_weekly,
-          :i_testing_group_code_coverage_project_click_total_monthly, :i_testing_group_code_coverage_project_click_total_weekly,
-          :i_testing_load_performance_widget_total_monthly, :i_testing_load_performance_widget_total_weekly,
-          :i_testing_metrics_report_artifact_uploaders_monthly, :i_testing_metrics_report_artifact_uploaders_weekly,
-          :testing_total_unique_counts_weekly
-        )
-      end
-
-      it 'includes quickactions monthly and weekly keys' do
-        expect(subject[:redis_hll_counters][:quickactions].keys).to include(
-          :i_quickactions_assign_multiple_monthly, :i_quickactions_assign_multiple_weekly,
-          :i_quickactions_child_epic_monthly, :i_quickactions_child_epic_weekly,
-          :i_quickactions_clear_weight_monthly, :i_quickactions_clear_weight_weekly,
-          :i_quickactions_epic_monthly, :i_quickactions_epic_weekly,
-          :i_quickactions_iteration_monthly, :i_quickactions_iteration_weekly,
-          :i_quickactions_parent_epic_monthly, :i_quickactions_parent_epic_weekly,
-          :i_quickactions_promote_monthly, :i_quickactions_promote_weekly,
-          :i_quickactions_publish_monthly, :i_quickactions_publish_weekly,
-          :i_quickactions_remove_child_epic_monthly, :i_quickactions_remove_child_epic_weekly,
-          :i_quickactions_remove_epic_monthly, :i_quickactions_remove_epic_weekly,
-          :i_quickactions_remove_iteration_monthly, :i_quickactions_remove_iteration_weekly,
-          :i_quickactions_remove_parent_epic_monthly, :i_quickactions_remove_parent_epic_weekly,
-          :i_quickactions_weight_monthly, :i_quickactions_weight_weekly,
-          :quickactions_total_unique_counts_weekly
-        )
      end
    end
  end

--- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb
+++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
@@ -189,6 +189,7 @@ module Gitlab

        def events_in_same_slot?(events)
          # if we check one event then redis_slot is only one to check
+          return false if events.empty?
          return true if events.size == 1

          slot = events.first[:redis_slot]

--- a/spec/lib/gitlab/usage_data_metrics_spec.rb
+++ b/spec/lib/gitlab/usage_data_metrics_spec.rb
@@ -26,32 +26,32 @@ RSpec.describe Gitlab::UsageDataMetrics do
        expect(subject[:counts]).to include(:boards)
      end

-      describe 'Redis_HLL_counters' do
-        # categories to be merged on future MR
-        let(:ignored_metric_files_key_patterns) do
-          %w(
-            analytics
-            ci_templates
-            ecosystem
-            deploy_token_packages
-            user_packages
-            epic_events
-            snippets
-            epics_usage
-            network_policies
-          ).freeze
+      it 'includes counts keys' do
+        expect(subject[:counts]).to include(:issues)
+      end
+
+      it 'includes usage_activity_by_stage keys' do
+        expect(subject[:usage_activity_by_stage][:plan]).to include(:issues)
+      end
+
+      it 'includes usage_activity_by_stage_monthly keys' do
+        expect(subject[:usage_activity_by_stage_monthly][:plan]).to include(:issues)
+      end
+
+      it 'includes settings keys' do
+        expect(subject[:settings]).to include(:collected_data_categories)
      end

+      describe 'Redis_HLL_counters' do
        let(:metric_files_key_paths) do
          Gitlab::Usage::MetricDefinition
            .definitions
            .select { |k, v| v.attributes[:data_source] == 'redis_hll' && v.key_path.starts_with?('redis_hll_counters') }
-            .reject { |k, v| v.key_path =~ Regexp.union(ignored_metric_files_key_patterns) }
            .keys
            .sort
        end

-        # Recursively traverse nested Hash of a generated Usage Ping to return an Array of key paths
+        # Recursively traverse nested Hash of a generated Service Ping to return an Array of key paths
        # in the dotted format used in metric definition YAML files, e.g.: 'count.category.metric_name'
        def parse_service_ping_keys(object, key_path = [])
          if object.is_a?(Hash)
@@ -63,34 +63,17 @@ RSpec.describe Gitlab::UsageDataMetrics do
          end
        end

-        let(:usage_ping_key_paths) do
+        let(:service_ping_key_paths) do
          parse_service_ping_keys(subject)
            .flatten
            .select { |k| k.starts_with?('redis_hll_counters') }
-            .reject {|k| k =~ Regexp.union(ignored_metric_files_key_patterns) }
            .sort
        end

-        it 'is included in the Usage Ping hash structure' do
-          expect(metric_files_key_paths).to match_array(usage_ping_key_paths)
+        it 'is included in the Service Ping hash structure' do
+          expect(metric_files_key_paths).to match_array(service_ping_key_paths)
        end
      end
-
-      it 'includes counts keys' do
-        expect(subject[:counts]).to include(:issues)
-      end
-
-      it 'includes usage_activity_by_stage keys' do
-        expect(subject[:usage_activity_by_stage][:plan]).to include(:issues)
-      end
-
-      it 'includes usage_activity_by_stage_monthly keys' do
-        expect(subject[:usage_activity_by_stage_monthly][:plan]).to include(:issues)
-      end
-
-      it 'includes settings keys' do
-        expect(subject[:settings]).to include(:collected_data_categories)
-      end
    end
  end
 end