diff --git a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
index 8d68bd81e2fcfba578ebb05bbf6f8ff2d71a8cac..f4212cf9c279f3eb8b8739de7cbb8029848e5ae9 100644
--- a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
+++ b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
@@ -8,7 +8,7 @@ product_group: source_code
 value_type: number
 status: active
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 instrumentation_class: RedisHLLMetric
 options:
   events:
diff --git a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
index f84d9c7483adef96c173938787cf84fd1da252a1..76faa2362476b9af7a2fbb532a5f272afbf0c47b 100644
--- a/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20211126084446_p_analytics_ci_cd_pipelines_monthly.yml
@@ -9,7 +9,7 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
index e151c55c1bcee8cc17e3826fbe69596e8c965e5e..12a7b7c15037abf3c2c599354ed80b01d387a76f 100644
--- a/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
+++ b/config/metrics/counts_28d/20211126090835_p_analytics_ci_cd_deployment_frequency_monthly.yml
@@ -9,7 +9,7 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: operational
 instrumentation_class: RedisHLLMetric
 performance_indicator_type:
diff --git a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
index f5a4882aca599c3b3b58075e1fdc7184b270db54..ee6a2d7205835ca8c7cc20314640cdd7e22b82a7 100644
--- a/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
+++ b/config/metrics/counts_28d/20211126091206_p_analytics_ci_cd_lead_time_monthly.yml
@@ -9,7 +9,7 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 28d
-data_source: redis_hll
+data_source: internal_events
 data_category: operational
 instrumentation_class: RedisHLLMetric
 performance_indicator_type:
diff --git a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
index a174cfc458857affa9df5546f3c691e098284188..18d2f77b2a415586be416615233732812666d2db 100644
--- a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
+++ b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
@@ -8,7 +8,7 @@ product_group: source_code
 value_type: number
 status: active
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 instrumentation_class: RedisHLLMetric
 options:
   events:
diff --git a/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
index e86741aedb28086cc4da7107294d2ca43913cafb..bb0e42314e6de06c80e46e5d359a474d04d6183f 100644
--- a/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
+++ b/config/metrics/counts_7d/20211126084441_p_analytics_ci_cd_pipelines_weekly.yml
@@ -9,7 +9,7 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
index f0bbdcbda6205f6b3c7434c0f027b9410944cc3b..6f89676da0cb573470ed880e1777dccc4fffff57 100644
--- a/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
+++ b/config/metrics/counts_7d/20211126090829_p_analytics_ci_cd_deployment_frequency_weekly.yml
@@ -9,7 +9,7 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
diff --git a/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
index d95376e277ad639015306e91020969b02b6103ed..1fa1a07d7bb2d19ea11e489a0bc0b79413931b3a 100644
--- a/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
+++ b/config/metrics/counts_7d/20211126091200_p_analytics_ci_cd_lead_time_weekly.yml
@@ -9,7 +9,7 @@ status: active
 milestone: '14.6'
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/75187
 time_frame: 7d
-data_source: redis_hll
+data_source: internal_events
 data_category: optional
 instrumentation_class: RedisHLLMetric
 performance_indicator_type: []
diff --git a/config/metrics/schema/redis_hll.json b/config/metrics/schema/redis_hll.json
index 35d520a5833e28321bccc50a670e069102bcaa37..255a4f89b9008e522af203e9a2d10860831de11c 100644
--- a/config/metrics/schema/redis_hll.json
+++ b/config/metrics/schema/redis_hll.json
@@ -32,7 +32,12 @@
         "required": [
           "instrumentation_class",
           "options"
-        ]
+        ],
+        "not": {
+          "required": [
+            "events"
+          ]
+        }
       },
       {
         "properties": {