Add latest changes from gitlab-org/gitlab@master

713 files changed, 4994 insertions, 3592 deletions

diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 39fefde6b60..ecbcc972ded 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-ec5dd7b3c441c744e4b74a083deec1f41435cb71
+83ae5a899a1f6005eb9e60ba170022337a36b7b4
diff --git a/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js b/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js
index 162491312a8..a1dd12ff769 100644
--- a/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js
+++ b/app/assets/javascripts/deprecated_jquery_dropdown/gl_dropdown.js
@@ -29,6 +29,26 @@ const FILTER_INPUT = '.dropdown-input .dropdown-input-field:not(.dropdown-no-fil
 
 const NO_FILTER_INPUT = '.dropdown-input .dropdown-input-field.dropdown-no-filter';
 
+let mouseEventListenersAdded = false;
+let mousedownTarget = null;
+let mouseupTarget = null;
+
+function addGlobalMouseEventListeners() {
+  // Remember mousedown and mouseup locations.
+  // Required in the `hide.bs.dropdown` listener for
+  // dropdown close prevention in some cases.
+  document.addEventListener('mousedown', ({ target }) => {
+    mousedownTarget = target;
+  });
+  document.addEventListener('mouseup', ({ target }) => {
+    mouseupTarget = target;
+  });
+  document.addEventListener('click', () => {
+    mousedownTarget = null;
+    mouseupTarget = null;
+  });
+}
+
 export class GitLabDropdown {
   constructor(el1, options) {
     let selector;
@@ -36,9 +56,14 @@ export class GitLabDropdown {
     this.el = el1;
     this.options = options;
     this.updateLabel = this.updateLabel.bind(this);
-    this.hidden = this.hidden.bind(this);
     this.opened = this.opened.bind(this);
+    this.hide = this.hide.bind(this);
+    this.hidden = this.hidden.bind(this);
     this.shouldPropagate = this.shouldPropagate.bind(this);
+    if (!mouseEventListenersAdded) {
+      addGlobalMouseEventListeners();
+      mouseEventListenersAdded = true;
+    }
     self = this;
     selector = $(this.el).data('target');
     this.dropdown = selector != null ? $(selector) : $(this.el).parent();
@@ -132,6 +157,7 @@ export class GitLabDropdown {
     }
     // Event listeners
     this.dropdown.on('shown.bs.dropdown', this.opened);
+    this.dropdown.on('hide.bs.dropdown', this.hide);
     this.dropdown.on('hidden.bs.dropdown', this.hidden);
     $(this.el).on('update.label', this.updateLabel);
     this.dropdown.on('click', '.dropdown-menu, .dropdown-menu-close', this.shouldPropagate);
@@ -334,6 +360,21 @@ export class GitLabDropdown {
     $menu.css('bottom', '100%');
   }
 
+  hide(e) {
+    // Prevent dropdowns with a search from being closed when the
+    // mousedown event happened inside the dropdown box and only
+    // the mouseup event did not.
+    if (this.options.search && mousedownTarget) {
+      const isIn = (element, $possibleContainer) => Boolean($possibleContainer.has(element).length);
+      const $menu = this.dropdown.find('.dropdown-menu');
+      const mousedownInsideDropdown = isIn(mousedownTarget, $menu);
+      const mouseupOutsideDropdown = !isIn(mouseupTarget, $menu);
+      if (mousedownInsideDropdown && mouseupOutsideDropdown) {
+        e.preventDefault();
+      }
+    }
+  }
+
   hidden(e) {
     this.resetRows();
     this.removeArrowKeyEvent();
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 334598da8b3..4852700d878 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -78,7 +78,7 @@
   code {
     font-family: $monospace-font;
     white-space: pre-wrap;
-    word-wrap: normal;
+    overflow-wrap: break-word;
     word-break: keep-all;
   }
 
diff --git a/app/graphql/types/label_type.rb b/app/graphql/types/label_type.rb
index 94fd15e075c..4e8718a80da 100644
--- a/app/graphql/types/label_type.rb
+++ b/app/graphql/types/label_type.rb
@@ -19,5 +19,9 @@ module Types
           description: 'Background color of the label.'
     field :text_color, GraphQL::STRING_TYPE, null: false,
           description: 'Text color of the label.'
+    field :created_at, Types::TimeType, null: false,
+          description: 'When this label was created.'
+    field :updated_at, Types::TimeType, null: false,
+          description: 'When this label was last updated.'
   end
 end
diff --git a/app/models/snippet_repository.rb b/app/models/snippet_repository.rb
index 54dbc579d54..0219ddc45d5 100644
--- a/app/models/snippet_repository.rb
+++ b/app/models/snippet_repository.rb
@@ -115,8 +115,10 @@ class SnippetRepository < ApplicationRecord
   end
 
   def invalid_path_error?(err)
-    err.is_a?(Gitlab::Git::Index::IndexError) &&
-      err.message.downcase.start_with?('invalid path', 'path cannot include directory traversal')
+    (err.is_a?(Gitlab::Git::Index::IndexError) &&
+      err.message.downcase.start_with?('invalid path', 'path cannot include directory traversal')) ||
+    (err.is_a?(Gitlab::Git::CommandError) &&
+      err.message.include?('CreateFile: invalid path'))
   end
 
   def invalid_signature_error?(err)
diff --git a/changelogs/unreleased/322096-fj-fix-regression-in-snippet-background-migration.yml b/changelogs/unreleased/322096-fj-fix-regression-in-snippet-background-migration.yml
new file mode 100644
index 00000000000..82ab6906348
--- /dev/null
+++ b/changelogs/unreleased/322096-fj-fix-regression-in-snippet-background-migration.yml
@@ -0,0 +1,5 @@
+---
+title: Fix snippet commit bug because of different Gitaly error
+merge_request: 54662
+author:
+type: fixed
diff --git a/changelogs/unreleased/33748-dont-close-auto-suggest-select-boxes-if-only-mouseup-outside-box.yml b/changelogs/unreleased/33748-dont-close-auto-suggest-select-boxes-if-only-mouseup-outside-box.yml
new file mode 100644
index 00000000000..e9ed4250c2e
--- /dev/null
+++ b/changelogs/unreleased/33748-dont-close-auto-suggest-select-boxes-if-only-mouseup-outside-box.yml
@@ -0,0 +1,5 @@
+---
+title: Don't close auto suggest select boxes on click if only the mouseup (but not the mousedown) event happened outside the box
+merge_request: 51139
+author: Simon Stieger @sim0
+type: fixed
diff --git a/changelogs/unreleased/kassio-graphql-expose-label-create-at-updated-at.yml b/changelogs/unreleased/kassio-graphql-expose-label-create-at-updated-at.yml
new file mode 100644
index 00000000000..134b0090146
--- /dev/null
+++ b/changelogs/unreleased/kassio-graphql-expose-label-create-at-updated-at.yml
@@ -0,0 +1,5 @@
+---
+title: 'GraphQL: Expose Label "created_at" and "updated_at"'
+merge_request: 54487
+author:
+type: changed
diff --git a/changelogs/unreleased/vs-break-long-code-line-in-markdown.yml b/changelogs/unreleased/vs-break-long-code-line-in-markdown.yml
new file mode 100644
index 00000000000..5ebf0cad97a
--- /dev/null
+++ b/changelogs/unreleased/vs-break-long-code-line-in-markdown.yml
@@ -0,0 +1,5 @@
+---
+title: Wrap long code lines in markdown
+merge_request: 54540
+author:
+type: fixed
diff --git a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
index c876f4d80a3..d589814b7af 100644
--- a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml b/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
index 4f152e95dae..ea3094527db 100644
--- a/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
+++ b/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml b/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
index 9b092532867..cb792aae308 100644
--- a/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
+++ b/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml b/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
index 4a74f474273..9fc7894d399 100644
--- a/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
+++ b/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml b/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
index 839a782de66..2ae3c3626d1 100644
--- a/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
+++ b/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml b/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
index 7a986a73760..86d84193265 100644
--- a/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
index 8f5600e31f9..ba5c4d27d25 100644
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml b/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
index fb16cd247e0..e4c15360b52 100644
--- a/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
+++ b/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
index 1d6a8e9d42f..da07cbee741 100644
--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml b/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
index eff46d3027d..afe6c79e885 100644
--- a/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
+++ b/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml b/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
index fcf3ee9d125..4ee8afd234b 100644
--- a/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
+++ b/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml b/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
index b0f5533bc03..c41b84dbcd0 100644
--- a/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
+++ b/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
index fb2b63ccdc9..843d3717ba7 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index c3c3054f8b7..77b6068fb8d 100644
--- 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
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
index 5a3da82e044..d7af387f862 100644
--- a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
index 753cae6d1b2..f3f7da5ee38 100644
--- a/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
index 581263a90ce..d7071bf4a79 100644
--- a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
+++ b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
index 72f9a347cdb..d173a922f5d 100644
--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml
index 5556d03e481..048ea4fd917 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
index 568e32a146e..7e9186a3a82 100644
--- a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
index 8d32d1259d3..56107e921f2 100644
--- a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
index 46cc3b65def..563a56c2a0f 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175109_suggestions.yml b/config/metrics/counts_28d/20210216175109_suggestions.yml
index 0690365ca49..74e388fd07d 100644
--- a/config/metrics/counts_28d/20210216175109_suggestions.yml
+++ b/config/metrics/counts_28d/20210216175109_suggestions.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
index 3f3c0d0ed19..de3049f76fa 100644
--- a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
index fb2774d185e..4f409dbf8c5 100644
--- a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
index 715bc6fb726..a23aed69c72 100644
--- a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
@@ -8,7 +8,9 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
index de746909276..dd315b5634d 100644
--- a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
@@ -8,7 +8,9 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
index c57f0583180..82d1c86d146 100644
--- a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
@@ -9,7 +9,9 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
index 6aa9ed7eedb..28d4477c037 100644
--- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
@@ -8,7 +8,9 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
index 3ca62a91742..c73a5da2585 100644
--- a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
@@ -8,7 +8,9 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
index 23a22cda59e..173ff6a995e 100644
--- a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
@@ -8,7 +8,9 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
index 7db3fdf0c2c..0c126afeb64 100644
--- a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
@@ -8,7 +8,9 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
index 2049b699a48..1c3801e77bc 100644
--- a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
@@ -8,7 +8,9 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
index 5e16a52c5aa..5a0bf9346a0 100644
--- a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
@@ -8,7 +8,9 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
index a060a55a6d3..9e8f191d7e5 100644
--- a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
@@ -8,7 +8,9 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
index db7904af520..9b3c359b6f0 100644
--- a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
@@ -8,7 +8,9 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
index 107efcfd937..be38418982d 100644
--- a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
@@ -8,7 +8,9 @@ product_category: code_review
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index 0cc879f115f..016d6c75cce 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index c6284e7495d..f67fb96b9ee 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index 9945af3d864..66456d42ffe 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
index b182f4be90d..7720ca5d26a 100644
--- a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
index d350bbb8756..8c125a51f89 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index de7742e7179..7464f28fc68 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index 3fc21783ee2..b818e52ecb5 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml b/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
index 6ad026afb75..a8b2cbc40dc 100644
--- a/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
+++ b/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216175618_dast_pipeline.yml b/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
index c337741d5f1..f4a110f8ca4 100644
--- a/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
+++ b/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
@@ -9,7 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
+distribution:
+- ce
 tier:
 - ultimate
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
index 85ffc7a1e5e..3a7b7f71051 100644
--- a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
index 9af6da42ba9..6a0fd1da84c 100644
--- a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
+++ b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
index 373eec9bc29..11ab783f52a 100644
--- a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
+++ b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
index 93c6a54ac63..3d7c3cb4066 100644
--- a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
+++ b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
index 1875ce5a3d1..e31bf71d455 100644
--- a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
index f35bd6f2540..f94ff9f026e 100644
--- a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
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 b9933f7c996..fca08b9f093 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,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
index 79c8e95700c..2cad76aa04c 100644
--- a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
index 9f766826eb7..aba5f8bc39a 100644
--- a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml b/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
index 0e12102a164..ce748ad1967 100644
--- a/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
+++ b/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml b/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
index fca89f3749a..59dfb493448 100644
--- a/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
+++ b/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
index 85ac6fa9a23..155eb508385 100644
--- a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
+++ b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
@@ -8,7 +8,7 @@ product_category: global_search
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
+data_source: redis_hll
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
index 4b40e58ad02..30899069f85 100644
--- a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
@@ -8,7 +8,7 @@ product_category: global_search
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
+data_source: redis_hll
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
index c01257d14d3..23c3f0fcb3f 100644
--- a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
index fdcbe4c0cc0..9d935a654e3 100644
--- a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
index 7d3c7b7974c..8ad00f8c06e 100644
--- a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
+++ b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
index f32fa31d7a2..2ea8eb63889 100644
--- a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
@@ -10,6 +10,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
index e2590a10c87..8100c8f6d86 100644
--- a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
index ad4f1cd8405..abd26612688 100644
--- a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
index ef4ec600ba0..a7f176028fa 100644
--- a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
index 505ad57c845..4a130cab39c 100644
--- a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
index 0b9f25bc08f..5509c6b492f 100644
--- a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
index a44e9ba6c9b..5475fc5c2b6 100644
--- a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
index c10255f5767..74566b19180 100644
--- a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
index 2ccc62f15ee..62614850622 100644
--- a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
index 807a8db5c6a..fe3e71ddea2 100644
--- a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml b/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
index afb8518bd45..3cd2c435074 100644
--- a/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
+++ b/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
index 8f4e2673b7d..b8b765b5790 100644
--- a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
index 67a3b6da400..e1a52b294fc 100644
--- a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
index 5a931fbae15..04fe154338d 100644
--- a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
index 84a15db585a..7cdeaa76e49 100644
--- a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
index 695c1b2a050..9dd091b74ea 100644
--- a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
+++ b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
@@ -9,7 +9,9 @@ product_category: incident_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
index 0993189efb1..93f07c24057 100644
--- a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
+++ b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
index b6862f107f1..e4af1478c64 100644
--- a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
+++ b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
index 84e13191783..125c1de4714 100644
--- a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
+++ b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180814_events.yml b/config/metrics/counts_28d/20210216180814_events.yml
index a9d3e6c3498..a1d95f73716 100644
--- a/config/metrics/counts_28d/20210216180814_events.yml
+++ b/config/metrics/counts_28d/20210216180814_events.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml
index bebb67d2b95..90723ed78ab 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml
index 69b732a3cd0..81ed776a3c4 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180820_ldap_keys.yml b/config/metrics/counts_28d/20210216180820_ldap_keys.yml
index 40e6581e540..0f64752fe96 100644
--- a/config/metrics/counts_28d/20210216180820_ldap_keys.yml
+++ b/config/metrics/counts_28d/20210216180820_ldap_keys.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180822_ldap_users.yml b/config/metrics/counts_28d/20210216180822_ldap_users.yml
index 4186dafeb32..6145b32959f 100644
--- a/config/metrics/counts_28d/20210216180822_ldap_users.yml
+++ b/config/metrics/counts_28d/20210216180822_ldap_users.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
index c07a0cd82a7..754da9e0006 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180956_clusters.yml b/config/metrics/counts_28d/20210216180956_clusters.yml
index f8d85732529..eb5d60f8a61 100644
--- a/config/metrics/counts_28d/20210216180956_clusters.yml
+++ b/config/metrics/counts_28d/20210216180956_clusters.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
index ec57599179b..97fb359c657 100644
--- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
index 419f3422a7c..96d737d9d14 100644
--- a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
index 10f627be137..6a559c1460f 100644
--- a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
index c9192d85660..caba12d3d44 100644
--- a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
index aa946ec2946..2533117f03b 100644
--- a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index 813ce7a55c4..4c6edc118aa 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -11,5 +11,6 @@ time_frame: 28d
 data_source: database
 distribution:
 - ce
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
index 76aeb2952d1..3fe9c7fde65 100644
--- a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
+++ b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
@@ -11,5 +11,6 @@ time_frame: 28d
 data_source:
 distribution:
 - ce
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index 0cc35e89a63..6412720342f 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -11,5 +11,6 @@ time_frame: 28d
 data_source:
 distribution:
 - ce
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181141_notes.yml b/config/metrics/counts_28d/20210216181141_notes.yml
index 2de45eb389f..d33a4c6ef9c 100644
--- a/config/metrics/counts_28d/20210216181141_notes.yml
+++ b/config/metrics/counts_28d/20210216181141_notes.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181143_projects.yml b/config/metrics/counts_28d/20210216181143_projects.yml
index c6e284e958a..36da5428dce 100644
--- a/config/metrics/counts_28d/20210216181143_projects.yml
+++ b/config/metrics/counts_28d/20210216181143_projects.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181145_todos.yml b/config/metrics/counts_28d/20210216181145_todos.yml
index 5b328f6e8ab..224711942e8 100644
--- a/config/metrics/counts_28d/20210216181145_todos.yml
+++ b/config/metrics/counts_28d/20210216181145_todos.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
index 4b6aa884234..9532586e2fe 100644
--- a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
index e774a6b42ea..fb8c998e3a1 100644
--- a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
+++ b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
index 25601d49dc6..d7851c9a134 100644
--- a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
+++ b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
index 198959bfee5..2fc84e2cefd 100644
--- a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
index 080facfd538..d341a41fc6e 100644
--- a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181158_epics.yml b/config/metrics/counts_28d/20210216181158_epics.yml
index c700e54407d..d0b71aa11d1 100644
--- a/config/metrics/counts_28d/20210216181158_epics.yml
+++ b/config/metrics/counts_28d/20210216181158_epics.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181200_label_lists.yml b/config/metrics/counts_28d/20210216181200_label_lists.yml
index 5be607f63f2..1c2ad77bdbb 100644
--- a/config/metrics/counts_28d/20210216181200_label_lists.yml
+++ b/config/metrics/counts_28d/20210216181200_label_lists.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181201_milestone_lists.yml b/config/metrics/counts_28d/20210216181201_milestone_lists.yml
index 9a3bbce4b90..8a83f9c8930 100644
--- a/config/metrics/counts_28d/20210216181201_milestone_lists.yml
+++ b/config/metrics/counts_28d/20210216181201_milestone_lists.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
index f6d6dfb06c8..f7216281bf3 100644
--- a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
index 40739d0a5e0..a5bc2a9dad6 100644
--- a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
index f08d715168a..0f5ab506a14 100644
--- a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
index 3688bbc27ac..21170e50629 100644
--- a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
+++ b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
index d81320bd095..9236d49731d 100644
--- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
index 6e4c7f024f7..01f3cadf87a 100644
--- a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
index a1bdc6bc216..0234b46775b 100644
--- a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
index 58baff8f6ff..d72fa3135bd 100644
--- a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index b6b5536ce6c..85e66885ef5 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml b/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
index 75ce398c2a4..1a0600278a5 100644
--- a/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml b/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
index 6551b93bc2a..6d94de26e26 100644
--- a/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
index 37d56371ed2..1f28ae1b252 100644
--- a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
+++ b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
index 2a3ca68e698..a8e6e0e75a1 100644
--- a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
+++ b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
index 36153d6df10..89f74760440 100644
--- a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
+++ b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
index 967e8f366c6..6700f5d2763 100644
--- a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
+++ b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
index ac41b45b17c..2023d5900c1 100644
--- a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
index 322468f0616..41b7b6b1737 100644
--- a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
index 6b567eff238..7be27b6fa65 100644
--- a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml b/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
index 7f7d9736163..8a69fafc2b2 100644
--- a/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
+++ b/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml b/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
index 312bfce6b36..4ae21d8852e 100644
--- a/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
+++ b/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml b/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
index f64f2aadf80..a269681d4dd 100644
--- a/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
+++ b/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
index 1187c7a05cb..29c0f3ef7d8 100644
--- a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
index 454623709a2..30925229543 100644
--- a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
+++ b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
index 141cde14714..cd346847a02 100644
--- a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
index 12ea1de387a..0b0a7dc3b8b 100644
--- a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
index e7b83a27838..ee67b5db3c1 100644
--- a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
index c73633f92db..fa356f4e3d6 100644
--- a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
index 85a880c5f24..6c1d26be10f 100644
--- a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
index c4444479dd1..390401de267 100644
--- a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
index b74b90a1e40..78f08de6f22 100644
--- a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml b/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
index 8569ea010e4..c2c986ca5ef 100644
--- a/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
index b9388d88e6d..5e2ddaa0ec3 100644
--- a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
+++ b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
index 8bc63f95a1c..cbb391035c3 100644
--- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
@@ -8,7 +8,9 @@ product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
index fa26310e71a..8115da08fd6 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
index 08a85f81cb3..ad94a07ca5b 100644
--- a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
+++ b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml b/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
index 1efb032a7ac..8db1e881bd4 100644
--- a/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
+++ b/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
index fe8cc577672..378a22daa87 100644
--- a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
+++ b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
index 22c632977ee..39142f74dc1 100644
--- a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
index 2559ed4e6e0..7d728bbc794 100644
--- a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
+++ b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
index 08afcfa963a..141ba7237d8 100644
--- a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml b/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
index 1141dc92680..5adcb8b0f27 100644
--- a/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
+++ b/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml b/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
index e20cd10aa2c..a13f3d322ff 100644
--- a/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
+++ b/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
index 9078d8ca73d..ca22455151e 100644
--- a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
index 827bbef9248..c10b3fe8107 100644
--- a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
+++ b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
index 738722d2744..d3bc2162c89 100644
--- a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
index 6996cce2470..a2d6b975753 100644
--- a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
index 2a2450f39b0..23adb6a769c 100644
--- a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
index 5fce08f5a02..43b4cff5c11 100644
--- a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
index 947e6e2c4b8..b7ac9de7655 100644
--- a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
+++ b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
index 88687997222..4d88092cd72 100644
--- a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
index d05591856f0..0fd293e1bb9 100644
--- a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
+++ b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
index f118f5eda26..1d5750e5b43 100644
--- a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml b/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
index 23dccbc6939..0b448b0d3a1 100644
--- a/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
+++ b/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
index 039f5553b36..b509c7ed358 100644
--- a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml b/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
index dc4380ef444..5759c131771 100644
--- a/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
+++ b/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
index 08a8ad89ffc..52d99012a45 100644
--- a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
+++ b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
index 0a502e1da59..552748c4f2c 100644
--- a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
index 975e0450502..71488207321 100644
--- a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
+++ b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
index 46cd10a140c..65a466c4bf9 100644
--- a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
index 62fb894164c..df657e463ba 100644
--- a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml b/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
index f99b8c3366d..2dbd62415f2 100644
--- a/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
+++ b/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml b/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
index 7498795d779..b4fe23e7d95 100644
--- a/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
+++ b/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml b/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
index fde932e490e..c4d79fc2e11 100644
--- a/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
+++ b/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
index 9389297a8e2..1043901a415 100644
--- a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
+++ b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
index ab6ba266bf0..23041ca9a37 100644
--- a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
index 5e1d169e5fd..fcdf21bf28e 100644
--- a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
+++ b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
index b8846e893ce..f285b5fc3f6 100644
--- a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
+++ b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
index f44c4e45029..afc8fc3e800 100644
--- a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml b/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
index 41386c20d7d..ad161fd2516 100644
--- a/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
+++ b/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
index dcbe7e1ecd3..5a75d6b7a24 100644
--- a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
+++ b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml b/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
index 1fda3c2d2b0..377f5e63c9b 100644
--- a/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
+++ b/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
index 55812dea57b..6b3ff3b44e4 100644
--- a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml b/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
index 62cd9082c35..073539710e3 100644
--- a/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
+++ b/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
index 2e0f82472fe..2ee78d245f9 100644
--- a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml b/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
index 26f06c4db2c..fffcbc6807d 100644
--- a/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
+++ b/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
index 22b49f8c68b..3ecaaa970f0 100644
--- a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
+++ b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
index 36659675d12..bb42563e34c 100644
--- a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
index a6e659b05a3..eea7e3672ea 100644
--- a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
+++ b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
index 183ae57d039..302cad17efd 100644
--- a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
+++ b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
index 755032bb1c3..01d87e2e8fb 100644
--- a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
+++ b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
index d32212d41e6..e80f988cf7a 100644
--- a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
+++ b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
index 06f3d855746..61077b79a6f 100644
--- a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
index 20988e1aca9..20934358839 100644
--- a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
index d6758f219fe..a390fb11746 100644
--- a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
index bfbbb80c63e..f8f078f5f27 100644
--- a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
+++ b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
index ac21b80a122..dd730656292 100644
--- a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
+++ b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
index 697536e47b0..ea3e2179ba6 100644
--- a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
index 9f84c74f48a..f50c85bcb2d 100644
--- a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
index 85cd2fec4bc..c17a807aaee 100644
--- a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
index b437145e67d..294dd992bf0 100644
--- a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
index 079b45490e2..a264457a478 100644
--- a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
index a48cf6d702b..c4c9dc56cfd 100644
--- a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
index 8423f81b846..45c44218cbd 100644
--- a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
index 9a4fb544d32..b9edfa92c20 100644
--- a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
index c1fbc9d0ab3..d54e8a4ab85 100644
--- a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml b/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
index 2cc0539963e..68caac40ead 100644
--- a/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
+++ b/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
index 1a4a622991e..419af8a68ee 100644
--- a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
index 3c1bdef7dcb..0af363b6429 100644
--- a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181923_successful_deployments.yml b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
index 5289f250ca3..76464e5dd27 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181924_failed_deployments.yml b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
index c4d2c15611e..e1d7f0b9762 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181935_deployments.yml b/config/metrics/counts_28d/20210216181935_deployments.yml
index 0387b8a80ed..e8a4ee547e8 100644
--- a/config/metrics/counts_28d/20210216181935_deployments.yml
+++ b/config/metrics/counts_28d/20210216181935_deployments.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181937_failed_deployments.yml b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
index 5622088ad83..2a14b42d03d 100644
--- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181939_releases.yml b/config/metrics/counts_28d/20210216181939_releases.yml
index 3dd876c6a16..bd76a32c973 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181941_successful_deployments.yml b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
index 1983f3b064d..b2052281d6e 100644
--- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml b/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
index 542c8242814..c05835b2100 100644
--- a/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
+++ b/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml b/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml
index a2e509ce036..c676e83f2d9 100644
--- a/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml
+++ b/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182034_deploy_keys.yml b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
index 557f7464b2e..80f50c7d1a5 100644
--- a/config/metrics/counts_28d/20210216182034_deploy_keys.yml
+++ b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182036_keys.yml b/config/metrics/counts_28d/20210216182036_keys.yml
index 9de84b6ff0d..d1299065115 100644
--- a/config/metrics/counts_28d/20210216182036_keys.yml
+++ b/config/metrics/counts_28d/20210216182036_keys.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
index 98e0d2c5be8..6b42f18e664 100644
--- a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
+++ b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
index 62b2b06ac7e..c75efaf0a80 100644
--- a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
+++ b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
index 49fb7cb1cac..25405624b03 100644
--- a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
+++ b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml b/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
index 7b6c9cc9379..c47fa49fe06 100644
--- a/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
+++ b/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml b/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
index cf5f54c7b9f..dfacce63f05 100644
--- a/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
+++ b/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml b/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
index 306794c733d..d87b910d239 100644
--- a/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
+++ b/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182051_protected_branches.yml b/config/metrics/counts_28d/20210216182051_protected_branches.yml
index a1973313006..81d23653307 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
index e462c460349..af59d1a1235 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
index 198ed408f57..8feb369d0fa 100644
--- a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
index 972abb590d2..6047e6b6059 100644
--- a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
@@ -8,7 +8,9 @@ product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
index 96fc1687223..15369757cb8 100644
--- a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
+++ b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
@@ -1,7 +1,7 @@
 ---
 key_path: redis_hll_counters.testing.i_testing_test_case_parsed_monthly
-description: Internal Tracking to count number of unit tests parsed for planning
-  of future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
+description: Internal Tracking to count number of unit tests parsed for planning of
+  future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
 product_section: ops
 product_stage: verify
 product_group: group::testing
@@ -9,7 +9,7 @@ product_category: code_testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
+data_source: redis_hll
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml b/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
index f4612ea73b5..1a475b19f01 100644
--- a/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
+++ b/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
@@ -1,7 +1,7 @@
 ---
 key_path: redis_hll_counters.testing.i_testing_metrics_report_artifact_uploaders_monthly
-description: Internal Tracking to count number of unit tests parsed for planning
-  of future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
+description: Internal Tracking to count number of unit tests parsed for planning of
+  future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
 product_section: ops
 product_stage: verify
 product_group: group::testing
@@ -9,7 +9,7 @@ product_category: code_testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
+data_source: redis_hll
 distribution:
 - ce
 - ee
diff --git a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
index c79ab73a49c..a9049c00aa5 100644
--- a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
+++ b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml b/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
index 8c8ec98abb1..a0f14b7a760 100644
--- a/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
+++ b/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
index 42dab444090..f4723c2b5a1 100644
--- a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
+++ b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
index 7ecdf9dba1c..fe8073f3f33 100644
--- a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
+++ b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml b/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
index 0629c5138b3..367cfb77c09 100644
--- a/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
+++ b/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml b/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
index 576ae5df7b0..e3980a944c6 100644
--- a/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
+++ b/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml b/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
index 69cf1bedc29..3808a2f2dcb 100644
--- a/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
+++ b/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml b/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
index 98b7683b509..85ea922568e 100644
--- a/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
+++ b/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml b/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
index 72c19a9c988..36a3dccbc95 100644
--- a/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
+++ b/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml b/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
index 53f37ba6379..a4f7695c505 100644
--- a/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
+++ b/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index a11a612fa13..74f20cbe5c4 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183629_two-factor.yml b/config/metrics/counts_28d/20210216183629_two-factor.yml
index 65958c34199..3b15b3e0eb7 100644
--- a/config/metrics/counts_28d/20210216183629_two-factor.yml
+++ b/config/metrics/counts_28d/20210216183629_two-factor.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml b/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
index 466379bfb97..08cbb3437d1 100644
--- a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
+++ b/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml b/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
index 89807ad1921..1a9251bcf16 100644
--- a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
+++ b/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183634_standard.yml b/config/metrics/counts_28d/20210216183634_standard.yml
index 4c34a16cb81..8afb1b2321b 100644
--- a/config/metrics/counts_28d/20210216183634_standard.yml
+++ b/config/metrics/counts_28d/20210216183634_standard.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183636_google_oauth2.yml b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
index 9785f2b4ae7..1ee1a70aaac 100644
--- a/config/metrics/counts_28d/20210216183636_google_oauth2.yml
+++ b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
index f6113d72b45..6651dfa0146 100644
--- a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
+++ b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183640_gitlab.yml b/config/metrics/counts_28d/20210216183640_gitlab.yml
index cdfb1bcbdad..d0977a24aee 100644
--- a/config/metrics/counts_28d/20210216183640_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183640_gitlab.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
index 080dec63ab8..ee61abedd8a 100644
--- a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
+++ b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183644_gitlab_project.yml b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
index 90b81ec9170..166be23baac 100644
--- a/config/metrics/counts_28d/20210216183644_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183646_gitlab.yml b/config/metrics/counts_28d/20210216183646_gitlab.yml
index e054a874b74..25bb788cc4f 100644
--- a/config/metrics/counts_28d/20210216183646_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183646_gitlab.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183648_github.yml b/config/metrics/counts_28d/20210216183648_github.yml
index 0acdb503860..6f79b49a37f 100644
--- a/config/metrics/counts_28d/20210216183648_github.yml
+++ b/config/metrics/counts_28d/20210216183648_github.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183650_bitbucket.yml b/config/metrics/counts_28d/20210216183650_bitbucket.yml
index 548992e8d10..fc31e325278 100644
--- a/config/metrics/counts_28d/20210216183650_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183650_bitbucket.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
index 16f4a96c887..fd0b64933b1 100644
--- a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183653_gitea.yml b/config/metrics/counts_28d/20210216183653_gitea.yml
index e5da548fd56..a09fdc9d610 100644
--- a/config/metrics/counts_28d/20210216183653_gitea.yml
+++ b/config/metrics/counts_28d/20210216183653_gitea.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183655_git.yml b/config/metrics/counts_28d/20210216183655_git.yml
index 4ab13fb99c9..b17900f534d 100644
--- a/config/metrics/counts_28d/20210216183655_git.yml
+++ b/config/metrics/counts_28d/20210216183655_git.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183657_manifest.yml b/config/metrics/counts_28d/20210216183657_manifest.yml
index 551bce45400..49fcefb3a45 100644
--- a/config/metrics/counts_28d/20210216183657_manifest.yml
+++ b/config/metrics/counts_28d/20210216183657_manifest.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
index 45822fdd9ba..700fe4b4881 100644
--- a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183701_jira.yml b/config/metrics/counts_28d/20210216183701_jira.yml
index 3a4ca4113dc..1ce602b4bd1 100644
--- a/config/metrics/counts_28d/20210216183701_jira.yml
+++ b/config/metrics/counts_28d/20210216183701_jira.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183703_fogbugz.yml b/config/metrics/counts_28d/20210216183703_fogbugz.yml
index e3ae256e9c3..3595c0ffdce 100644
--- a/config/metrics/counts_28d/20210216183703_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183703_fogbugz.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183705_phabricator.yml b/config/metrics/counts_28d/20210216183705_phabricator.yml
index 4bab0cdac34..5be1c6263aa 100644
--- a/config/metrics/counts_28d/20210216183705_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183705_phabricator.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183707_csv.yml b/config/metrics/counts_28d/20210216183707_csv.yml
index 136753c4baf..398d740d78d 100644
--- a/config/metrics/counts_28d/20210216183707_csv.yml
+++ b/config/metrics/counts_28d/20210216183707_csv.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183709_group_import.yml b/config/metrics/counts_28d/20210216183709_group_import.yml
index 57b21468384..9116a242811 100644
--- a/config/metrics/counts_28d/20210216183709_group_import.yml
+++ b/config/metrics/counts_28d/20210216183709_group_import.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
index 63c6b2271a6..1399e4ebe6d 100644
--- a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183712_total.yml b/config/metrics/counts_28d/20210216183712_total.yml
index bfbb93dbec6..1b524c91a20 100644
--- a/config/metrics/counts_28d/20210216183712_total.yml
+++ b/config/metrics/counts_28d/20210216183712_total.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183714_gitlab_project.yml b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
index a90ffe1ea2f..16fc5757546 100644
--- a/config/metrics/counts_28d/20210216183714_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183716_gitlab.yml b/config/metrics/counts_28d/20210216183716_gitlab.yml
index 24e71b00698..bd69b4a9ec3 100644
--- a/config/metrics/counts_28d/20210216183716_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183716_gitlab.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183718_github.yml b/config/metrics/counts_28d/20210216183718_github.yml
index 9fffbe56533..7e67e2d0b84 100644
--- a/config/metrics/counts_28d/20210216183718_github.yml
+++ b/config/metrics/counts_28d/20210216183718_github.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183720_bitbucket.yml b/config/metrics/counts_28d/20210216183720_bitbucket.yml
index ba564020f6a..0ca34450fbc 100644
--- a/config/metrics/counts_28d/20210216183720_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183720_bitbucket.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
index 42e0fe2e2dc..7f2ea025d80 100644
--- a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183724_gitea.yml b/config/metrics/counts_28d/20210216183724_gitea.yml
index c7473610f21..d4834863316 100644
--- a/config/metrics/counts_28d/20210216183724_gitea.yml
+++ b/config/metrics/counts_28d/20210216183724_gitea.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183726_git.yml b/config/metrics/counts_28d/20210216183726_git.yml
index 1ee4a89842f..f844b90426c 100644
--- a/config/metrics/counts_28d/20210216183726_git.yml
+++ b/config/metrics/counts_28d/20210216183726_git.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183728_manifest.yml b/config/metrics/counts_28d/20210216183728_manifest.yml
index df8d1e338b8..997db699083 100644
--- a/config/metrics/counts_28d/20210216183728_manifest.yml
+++ b/config/metrics/counts_28d/20210216183728_manifest.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183730_jira.yml b/config/metrics/counts_28d/20210216183730_jira.yml
index 3c29a685d92..70223435940 100644
--- a/config/metrics/counts_28d/20210216183730_jira.yml
+++ b/config/metrics/counts_28d/20210216183730_jira.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183731_fogbugz.yml b/config/metrics/counts_28d/20210216183731_fogbugz.yml
index 19774b68d70..e8e8a618077 100644
--- a/config/metrics/counts_28d/20210216183731_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183731_fogbugz.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183733_phabricator.yml b/config/metrics/counts_28d/20210216183733_phabricator.yml
index 68eb63bef3e..bf9f52055f2 100644
--- a/config/metrics/counts_28d/20210216183733_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183733_phabricator.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183735_csv.yml b/config/metrics/counts_28d/20210216183735_csv.yml
index 3fc40b0a2aa..c4267bda332 100644
--- a/config/metrics/counts_28d/20210216183735_csv.yml
+++ b/config/metrics/counts_28d/20210216183735_csv.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183737_groups_imported.yml b/config/metrics/counts_28d/20210216183737_groups_imported.yml
index afd63a6787c..8e49b36a9a2 100644
--- a/config/metrics/counts_28d/20210216183737_groups_imported.yml
+++ b/config/metrics/counts_28d/20210216183737_groups_imported.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183753_projects_incident_sla_enabled.yml b/config/metrics/counts_28d/20210216183753_projects_incident_sla_enabled.yml
index 2af9d985403..660a1b1583b 100644
--- a/config/metrics/counts_28d/20210216183753_projects_incident_sla_enabled.yml
+++ b/config/metrics/counts_28d/20210216183753_projects_incident_sla_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml b/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
index bb2256ffaf1..c93f4bfbe85 100644
--- a/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
+++ b/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183826_sast_scans.yml b/config/metrics/counts_28d/20210216183826_sast_scans.yml
index 541032eb933..81824a66f09 100644
--- a/config/metrics/counts_28d/20210216183826_sast_scans.yml
+++ b/config/metrics/counts_28d/20210216183826_sast_scans.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml b/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
index f7b84391e93..f4eb1e39947 100644
--- a/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
+++ b/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml b/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml
index 79d801476d4..f05361d80bc 100644
--- a/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml
+++ b/config/metrics/counts_28d/20210216183830_container_scanning_scans.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183832_dast_scans.yml b/config/metrics/counts_28d/20210216183832_dast_scans.yml
index 3b2f50488c7..daa8db24b65 100644
--- a/config/metrics/counts_28d/20210216183832_dast_scans.yml
+++ b/config/metrics/counts_28d/20210216183832_dast_scans.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml b/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml
index 83937977371..dfab9034bd0 100644
--- a/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml
+++ b/config/metrics/counts_28d/20210216183834_secret_detection_scans.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml b/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
index edcfc5766f7..9e3248c7211 100644
--- a/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
+++ b/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml b/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
index e118c66638e..db92fcddb74 100644
--- a/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
+++ b/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
index 337420513f6..a95d2ba6e89 100644
--- a/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
index cfb190b2d39..3f503247aa5 100644
--- a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: 28d
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml b/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml
index 9c25ae78891..be1f63fad18 100644
--- a/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml
+++ b/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml b/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml
index 9cbd056bdb1..d3262c4d9ca 100644
--- a/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml
+++ b/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml b/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml
index ba429cf2198..fb8284bcf31 100644
--- a/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml
+++ b/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml b/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml
index 14292925215..f05fedf23c9 100644
--- a/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml
+++ b/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml b/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml
index 732f5cea363..ba9bcfba41e 100644
--- a/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml
+++ b/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
index b116203c7f5..63131ea83e2 100644
--- a/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
index 7db72da092e..ee06f117ff8 100644
--- a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
+++ b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184035_i_search_paid_monthly.yml b/config/metrics/counts_28d/20210216184035_i_search_paid_monthly.yml
index 1fd804e5195..18e435b1677 100644
--- a/config/metrics/counts_28d/20210216184035_i_search_paid_monthly.yml
+++ b/config/metrics/counts_28d/20210216184035_i_search_paid_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
index 9c729c77607..eb0ffa26d2a 100644
--- a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
index 44ae2153803..12d51d8d560 100644
--- a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml b/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
index 292351a7a64..124f322132f 100644
--- a/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
index 2f45d21b8ba..e9d67155907 100644
--- a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
+++ b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
index 40156538266..7d981f850e2 100644
--- a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
+++ b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
index 1e77f83540f..b649192d659 100644
--- a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
index af78c54384a..12d7e8ab749 100644
--- a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
+++ b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
index 4fb961d954d..1df3325b027 100644
--- a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
index b583a3ee471..527105a58fe 100644
--- a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
index 2a887097e3a..cdf2d1135aa 100644
--- a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
index f20f9728706..d4a27feb8f3 100644
--- a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
index de7ba9efb3d..27899299abb 100644
--- a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
index 2b9f7dc5aa1..ad564e57ab7 100644
--- a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
+++ b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
index 35d23369273..10c13e8796f 100644
--- a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
+++ b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
index f3c9628c3cd..a6bac39ace0 100644
--- a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
index c963ec76ea1..937e17e3daf 100644
--- a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
index 4222061b466..c88078ffa2b 100644
--- a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
index 9d62c606882..1bd3172b9f6 100644
--- a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
index 9f58363730b..594393e33d6 100644
--- a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
index 989fea55ad3..8bbaa0dc420 100644
--- a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
index 85bdd5b9e73..f294f887c99 100644
--- a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
index 4f3f1b0f320..d3c4647abbb 100644
--- a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
+++ b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
index cbac4eace20..afbf5e0f3f5 100644
--- a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
index 8fea2a1ba66..565e1346a62 100644
--- a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
+++ b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
index 89e6f9e771e..c21e94ab4ab 100644
--- a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
index 01e0157a0d3..c1f06831606 100644
--- a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
index fe4f9bc7d19..a985393fa6b 100644
--- a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index b44e56fa249..72590d59bd1 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index ce008d53d00..e5931e25cdd 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 7efa454a102..7d52a2807e6 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 7074700beec..1f753124f46 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 889bbf1c459..5bb03d5c1c9 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 316c4b3bed8..d519411c9f8 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 936a7b5718a..62ee737153d 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index de64a4c757d..55f938dfce1 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 07a971f0e62..0f94788b355 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index b97b64e01ee..2483245b23d 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index ebc34286239..7ce990172df 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index d0c8ef3dd1a..a585ef5fbb9 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 7ac4063ec10..2e5b87677e1 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index c520f3b9446..e8907f63243 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index f6bd5d25e65..b97c4005529 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 1affecc9ee8..fac0fa40406 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 6211f98adfc..541d619a6e7 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
index 3b88babdd97..59771f0f021 100644
--- a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 390354052ab..5d25977e938 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 130cba9b5ff..5f86c64cda6 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 5475816453e..6ba5297d60d 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 3f3db225e7b..9fe96b21e7e 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 1322f84ac46..982d765b5fa 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index cf73a48db51..b5001143b05 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index d72d567cb45..220fa24696b 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 9037479b2be..ba98e8363a0 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index d640e2775ea..2fe6251f959 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 9580e1ba85b..db8b894abf7 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 9b92f497eff..b69c4aa13d5 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index e2f7ef062a2..b17e2a671b3 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
index b8b73b0784c..821a30c475f 100644
--- a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
index e622900b30d..34ca1cba1e8 100644
--- a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
index d5736111b72..dd916840cb1 100644
--- a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
index 1c50bc3490a..d72c6db17bb 100644
--- a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
index adcbafff268..af2d01d8320 100644
--- a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
index 51ddb6203f9..031a6b51b04 100644
--- a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
index b15e7eba64f..4a4649cd38a 100644
--- a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
index 9b4c23a71b5..12dd245e7be 100644
--- a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
index ce00c355461..6035e571393 100644
--- a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
index 58a099bf478..eff9b749fb4 100644
--- a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
index 196145c4d55..15c078db1f9 100644
--- a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 004e9fc5ba1..c21e9bebd6c 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index ad2ca06c0c5..c5fa7e2dcf7 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git 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
index 837507eb1a1..f4469c41dd3 100644
--- 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
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml b/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
index 13ae0fa7d05..dd114b37a99 100644
--- a/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
+++ b/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml b/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
index 8f6cbe8f9d2..04f33c6f333 100644
--- a/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
index 0e0a82372e4..6c1d08964a9 100644
--- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
@@ -8,7 +8,9 @@ product_category: ''
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: redis
-distribution: []
-tier: []
+data_source: redis_hll
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
index 07b20fd2938..045855e6f2d 100644
--- a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -1,6 +1,7 @@
 ---
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
-description: Distinct users count that changed issue title in a group for last recent week
+description: Distinct users count that changed issue title in a group for last recent
+  week
 product_stage: plan
 product_group: group::project management
 product_category: issue_tracking
@@ -17,4 +18,3 @@ tier:
 - free
 - premium
 - ultimate
-
diff --git a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
index 0b6249a99fc..986fe5b561f 100644
--- a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
+++ b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
@@ -8,7 +8,7 @@ product_category: global_search
 value_type: number
 status: data_available
 time_frame: 7d
-data_source: redis
+data_source: redis_hll
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
index e45a14f4678..e50a7a4d3cf 100644
--- a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
@@ -8,7 +8,7 @@ product_category: global_search
 value_type: number
 status: data_available
 time_frame: 7d
-data_source: redis
+data_source: redis_hll
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
index e75531c8863..f6f2bb9ab74 100644
--- a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
+++ b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
@@ -1,7 +1,7 @@
 ---
 key_path: redis_hll_counters.testing.i_testing_test_case_parsed_weekly
-description: Internal Tracking to count number of unit tests parsed for planning
-  of future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
+description: Internal Tracking to count number of unit tests parsed for planning of
+  future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
 product_section: ops
 product_stage: verify
 product_group: group::testing
@@ -9,7 +9,7 @@ product_category: code_testing
 value_type: number
 status: data_available
 time_frame: 7d
-data_source: redis
+data_source: redis_hll
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml b/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
index 4f016469376..f88b6539ceb 100644
--- a/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
+++ b/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
@@ -1,7 +1,7 @@
 ---
 key_path: redis_hll_counters.testing.i_testing_metrics_report_artifact_uploaders_weekly
-description: Internal Tracking to count number of unit tests parsed for planning
-  of future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
+description: Internal Tracking to count number of unit tests parsed for planning of
+  future code testing features. Data available [here](https://app.periscopedata.com/app/gitlab/788674/Verify:Testing-Group-Metrics?widget=10454394&udv=0)
 product_section: ops
 product_stage: verify
 product_group: group::testing
@@ -9,7 +9,7 @@ product_category: code_testing
 value_type: number
 status: data_available
 time_frame: 7d
-data_source: redis
+data_source: redis_hll
 distribution:
 - ee
 - ce
diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml
index 3103797ccce..9732b34c771 100644
--- a/config/metrics/counts_all/20210204124930_servers.yml
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml
index 1bb86905502..c1ada3babcd 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index 0a0b2274c14..6885d8971d1 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml b/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
index f94dd6dc338..03271ea0f13 100644
--- a/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml b/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
index 8c68ee9f7d6..a56358e7d13 100644
--- a/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
+++ b/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174838_g_analytics_insights.yml b/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
index 2307cd8e890..72197fa6f29 100644
--- a/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
+++ b/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174840_g_analytics_issues.yml b/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
index f06d6fcaa79..dc042c141e3 100644
--- a/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
+++ b/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml b/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
index d2121641576..eeab6200458 100644
--- a/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
+++ b/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml b/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
index 73cf060bf2e..92399204faa 100644
--- a/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
+++ b/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
index 61a56fc3022..8138873e882 100644
--- a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
+++ b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml b/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
index 656de839afc..ac00c26a5ee 100644
--- a/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
+++ b/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
index 44aba8f0475..b2802ab9084 100644
--- a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
+++ b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174852_p_analytics_insights.yml b/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
index b70c1b73ef4..48c7e333b2c 100644
--- a/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
+++ b/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174854_p_analytics_issues.yml b/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
index 13c21a5a96c..86f7634ea32 100644
--- a/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
+++ b/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
index af1e9e03e86..275cdd1e45b 100644
--- a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
+++ b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
index a000a76b951..14ff37dd4ad 100644
--- a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
+++ b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml b/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
index 90e0d056550..586b9a15b70 100644
--- a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
+++ b/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
index 8ec4bfebd77..537a1c5dae8 100644
--- a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml b/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
index 2e1a3f45665..f8d509c9130 100644
--- a/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
+++ b/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
index 5fedb7c7789..e834d6ae823 100644
--- a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
+++ b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
index eae7eca564a..d4d010ab419 100644
--- a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
+++ b/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
index 30697a96559..3b2561bae52 100644
--- a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
index b787a1ef367..8e1129883ae 100644
--- a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
@@ -12,5 +12,6 @@ data_source: database
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175026_service_desk_issues.yml b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
index 7512aab4043..b852ae8b62f 100644
--- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
@@ -12,5 +12,6 @@ data_source: database
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175028_requirements_created.yml b/config/metrics/counts_all/20210216175028_requirements_created.yml
index 284b01caee1..74780f43c5a 100644
--- a/config/metrics/counts_all/20210216175028_requirements_created.yml
+++ b/config/metrics/counts_all/20210216175028_requirements_created.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175037_suggestions.yml b/config/metrics/counts_all/20210216175037_suggestions.yml
index dc9bafdaae6..98ec2bd6d7c 100644
--- a/config/metrics/counts_all/20210216175037_suggestions.yml
+++ b/config/metrics/counts_all/20210216175037_suggestions.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175039_merge_requests.yml b/config/metrics/counts_all/20210216175039_merge_requests.yml
index f8bbb0eeb77..3c17daf2622 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175041_merge_request_comment.yml b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
index d8a1f059dc8..382110c11db 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175043_merge_request_create.yml b/config/metrics/counts_all/20210216175043_merge_request_create.yml
index 09cd50f19c7..39ce0ef072a 100644
--- a/config/metrics/counts_all/20210216175043_merge_request_create.yml
+++ b/config/metrics/counts_all/20210216175043_merge_request_create.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175045_merge_requests.yml b/config/metrics/counts_all/20210216175045_merge_requests.yml
index 74a8bf3f614..47966f197e4 100644
--- a/config/metrics/counts_all/20210216175045_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175045_merge_requests.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175053_suggestions.yml b/config/metrics/counts_all/20210216175053_suggestions.yml
index 21dd994e44e..15a846c49d8 100644
--- a/config/metrics/counts_all/20210216175053_suggestions.yml
+++ b/config/metrics/counts_all/20210216175053_suggestions.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml b/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml
index 6a969648cf1..e0c55e89f30 100644
--- a/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml
+++ b/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index bc561f639d1..2f134ac7076 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
index ab3e5e140e3..863ea73cbee 100644
--- a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
+++ b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
index e9fdd29d5b0..8e48a723caa 100644
--- a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
index 0d8102cb27e..9854006b1dc 100644
--- a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175324_terraform_reports.yml b/config/metrics/counts_all/20210216175324_terraform_reports.yml
index 82b19f4885e..4b83d4c944c 100644
--- a/config/metrics/counts_all/20210216175324_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175324_terraform_reports.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175326_terraform_states.yml b/config/metrics/counts_all/20210216175326_terraform_states.yml
index 53300bd7b41..c9696eaf26e 100644
--- a/config/metrics/counts_all/20210216175326_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175326_terraform_states.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175510_ci_builds.yml b/config/metrics/counts_all/20210216175510_ci_builds.yml
index 1229037c743..a70878ce352 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
index 40709fa39c7..425da65a0d5 100644
--- a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
index 4490e153f2a..bf62f8096df 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
index 6ff78ddcfdc..ac9ce910867 100644
--- a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
index 5eb46d5464d..dc796d25bb0 100644
--- a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index f73f8137f6f..4bac8d39737 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175521_ci_triggers.yml b/config/metrics/counts_all/20210216175521_ci_triggers.yml
index 6c03f6e17ca..5a2015d6fdf 100644
--- a/config/metrics/counts_all/20210216175521_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175521_ci_triggers.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
index 4005205e76f..330b0b64e26 100644
--- a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175525_ci_builds.yml b/config/metrics/counts_all/20210216175525_ci_builds.yml
index 58753fb2a8f..a9a5d9f6a88 100644
--- a/config/metrics/counts_all/20210216175525_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175525_ci_builds.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
index 3cb3cfd15f5..bc29f8fd33c 100644
--- a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
index 5e4a0aa7d41..9eb1541828f 100644
--- a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
index f194b69cb2d..046f94261e1 100644
--- a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
index c3e0594f878..6daf1a8fbd6 100644
--- a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
index 6268a64b8b6..be012a5ff3e 100644
--- a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
index 04afe61bdc3..e9394e70fd1 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175539_ci_triggers.yml b/config/metrics/counts_all/20210216175539_ci_triggers.yml
index 0a3421b782a..d284687894a 100644
--- a/config/metrics/counts_all/20210216175539_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175539_ci_triggers.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175612_dast_jobs.yml b/config/metrics/counts_all/20210216175612_dast_jobs.yml
index a84bceda23f..8672e18dbfa 100644
--- a/config/metrics/counts_all/20210216175612_dast_jobs.yml
+++ b/config/metrics/counts_all/20210216175612_dast_jobs.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175614_user_dast_jobs.yml b/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
index dee1e73b98c..900cd5b37b7 100644
--- a/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
+++ b/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216175621_web_hooks.yml b/config/metrics/counts_all/20210216175621_web_hooks.yml
index 3a11c3fee3c..ad7d9de8f12 100644
--- a/config/metrics/counts_all/20210216175621_web_hooks.yml
+++ b/config/metrics/counts_all/20210216175621_web_hooks.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
index a033c4c9269..5dc21447e37 100644
--- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
+++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
index 1967a13fbb5..3e38b9f8f7b 100644
--- a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml b/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
index c8adeb5d308..31d9650c54e 100644
--- a/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
+++ b/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml b/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
index 5c1fb473f2c..deef6c0f6d4 100644
--- a/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
+++ b/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml b/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
index 42bd092b8e2..ab35c608bcb 100644
--- a/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
+++ b/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml b/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
index 16a86ac13ae..04b1177dacf 100644
--- a/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
+++ b/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
index e836c723a91..a8e4acaae15 100644
--- a/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
+++ b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
index 9d46d9cd358..3fbbbdece3d 100644
--- a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
+++ b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
index 5cc07ca7905..4fe6799d027 100644
--- a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
+++ b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
index 8b9da416579..e850bb6c2a8 100644
--- a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
+++ b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml b/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
index 7f52c961aed..e1c1bfafe31 100644
--- a/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
+++ b/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml b/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
index f0647c8aa85..db3e1c12b7b 100644
--- a/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
+++ b/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180506_status_page_projects.yml b/config/metrics/counts_all/20210216180506_status_page_projects.yml
index 802f892988e..5ff16f3dd47 100644
--- a/config/metrics/counts_all/20210216180506_status_page_projects.yml
+++ b/config/metrics/counts_all/20210216180506_status_page_projects.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180507_status_page_issues.yml b/config/metrics/counts_all/20210216180507_status_page_issues.yml
index fc87c88a2ad..5db63243d35 100644
--- a/config/metrics/counts_all/20210216180507_status_page_issues.yml
+++ b/config/metrics/counts_all/20210216180507_status_page_issues.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
index 1f7689b1606..c064e33f30a 100644
--- a/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
index 2801fc78e50..bbedec31c43 100644
--- a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
+++ b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
index 8aace98ca70..87e013bdcb5 100644
--- a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml b/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
index 85e77b095ca..84a828a467b 100644
--- a/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
+++ b/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
index ad951983e29..47c20ec6cfb 100644
--- a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
index 10f338c872e..893b92b1f12 100644
--- a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
index 584c87c6990..f8629496cb6 100644
--- a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
+++ b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180634_gitlab.yml b/config/metrics/counts_all/20210216180634_gitlab.yml
index 552243da5bf..b4a2e2454d0 100644
--- a/config/metrics/counts_all/20210216180634_gitlab.yml
+++ b/config/metrics/counts_all/20210216180634_gitlab.yml
@@ -10,6 +10,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180636_gitlab_v1.yml b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
index 5bc4628b30b..1c4fa2c62fe 100644
--- a/config/metrics/counts_all/20210216180636_gitlab_v1.yml
+++ b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180638_gitlab_project.yml b/config/metrics/counts_all/20210216180638_gitlab_project.yml
index 93bf43b669c..a9d167f7363 100644
--- a/config/metrics/counts_all/20210216180638_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180638_gitlab_project.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180639_gitlab.yml b/config/metrics/counts_all/20210216180639_gitlab.yml
index e0579eb01c8..3fef2ce3b85 100644
--- a/config/metrics/counts_all/20210216180639_gitlab.yml
+++ b/config/metrics/counts_all/20210216180639_gitlab.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180641_github.yml b/config/metrics/counts_all/20210216180641_github.yml
index c448b5cba82..530e9b05e14 100644
--- a/config/metrics/counts_all/20210216180641_github.yml
+++ b/config/metrics/counts_all/20210216180641_github.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180643_bitbucket.yml b/config/metrics/counts_all/20210216180643_bitbucket.yml
index 1de7648205d..6490c8ffb55 100644
--- a/config/metrics/counts_all/20210216180643_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180643_bitbucket.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180645_bitbucket_server.yml b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
index ca0c6b8f2a8..bfbee0b3433 100644
--- a/config/metrics/counts_all/20210216180645_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180647_gitea.yml b/config/metrics/counts_all/20210216180647_gitea.yml
index 4e1f022d73a..74b4fd36714 100644
--- a/config/metrics/counts_all/20210216180647_gitea.yml
+++ b/config/metrics/counts_all/20210216180647_gitea.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180649_git.yml b/config/metrics/counts_all/20210216180649_git.yml
index 7cc6a24dfab..b7dd7ca8d7e 100644
--- a/config/metrics/counts_all/20210216180649_git.yml
+++ b/config/metrics/counts_all/20210216180649_git.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180650_manifest.yml b/config/metrics/counts_all/20210216180650_manifest.yml
index 3057c18ad59..4ef7823ee67 100644
--- a/config/metrics/counts_all/20210216180650_manifest.yml
+++ b/config/metrics/counts_all/20210216180650_manifest.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180652_gitlab_migration.yml b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
index ae8319d7a98..3df4472c9a7 100644
--- a/config/metrics/counts_all/20210216180652_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180654_jira.yml b/config/metrics/counts_all/20210216180654_jira.yml
index 5bb2d242fd4..6e72bc630bd 100644
--- a/config/metrics/counts_all/20210216180654_jira.yml
+++ b/config/metrics/counts_all/20210216180654_jira.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180656_fogbugz.yml b/config/metrics/counts_all/20210216180656_fogbugz.yml
index 6ec3a0da666..8a52d04b615 100644
--- a/config/metrics/counts_all/20210216180656_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180656_fogbugz.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180658_phabricator.yml b/config/metrics/counts_all/20210216180658_phabricator.yml
index 25bf16b79e7..51559f87ae2 100644
--- a/config/metrics/counts_all/20210216180658_phabricator.yml
+++ b/config/metrics/counts_all/20210216180658_phabricator.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180700_csv.yml b/config/metrics/counts_all/20210216180700_csv.yml
index 0f7b89a2b30..bed309794eb 100644
--- a/config/metrics/counts_all/20210216180700_csv.yml
+++ b/config/metrics/counts_all/20210216180700_csv.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180702_group_import.yml b/config/metrics/counts_all/20210216180702_group_import.yml
index e25f73d7fa2..109a722738e 100644
--- a/config/metrics/counts_all/20210216180702_group_import.yml
+++ b/config/metrics/counts_all/20210216180702_group_import.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180703_gitlab_migration.yml b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
index 39f93fc2bcb..74c7e66adfc 100644
--- a/config/metrics/counts_all/20210216180703_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180705_total.yml b/config/metrics/counts_all/20210216180705_total.yml
index 556eea433d9..9e6c83593d5 100644
--- a/config/metrics/counts_all/20210216180705_total.yml
+++ b/config/metrics/counts_all/20210216180705_total.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180707_gitlab_project.yml b/config/metrics/counts_all/20210216180707_gitlab_project.yml
index 921b56c3da5..173e20245ae 100644
--- a/config/metrics/counts_all/20210216180707_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180707_gitlab_project.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180709_gitlab.yml b/config/metrics/counts_all/20210216180709_gitlab.yml
index 927eaef3400..fee163d2728 100644
--- a/config/metrics/counts_all/20210216180709_gitlab.yml
+++ b/config/metrics/counts_all/20210216180709_gitlab.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180711_github.yml b/config/metrics/counts_all/20210216180711_github.yml
index 9c8eb6ca77e..9e701f04fe3 100644
--- a/config/metrics/counts_all/20210216180711_github.yml
+++ b/config/metrics/counts_all/20210216180711_github.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180713_bitbucket.yml b/config/metrics/counts_all/20210216180713_bitbucket.yml
index 8b710bdacfb..f9aea1fd773 100644
--- a/config/metrics/counts_all/20210216180713_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180713_bitbucket.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180715_bitbucket_server.yml b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
index 965e8bab64c..e9f46e2af33 100644
--- a/config/metrics/counts_all/20210216180715_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180716_gitea.yml b/config/metrics/counts_all/20210216180716_gitea.yml
index ae8654bd2d9..4ff1f0c2aef 100644
--- a/config/metrics/counts_all/20210216180716_gitea.yml
+++ b/config/metrics/counts_all/20210216180716_gitea.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180718_git.yml b/config/metrics/counts_all/20210216180718_git.yml
index 979fa32262e..c36d2ce4d42 100644
--- a/config/metrics/counts_all/20210216180718_git.yml
+++ b/config/metrics/counts_all/20210216180718_git.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180720_manifest.yml b/config/metrics/counts_all/20210216180720_manifest.yml
index e318dd42e73..c5d35a9707b 100644
--- a/config/metrics/counts_all/20210216180720_manifest.yml
+++ b/config/metrics/counts_all/20210216180720_manifest.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180722_jira.yml b/config/metrics/counts_all/20210216180722_jira.yml
index 38a345c212f..ac462893331 100644
--- a/config/metrics/counts_all/20210216180722_jira.yml
+++ b/config/metrics/counts_all/20210216180722_jira.yml
@@ -1,6 +1,6 @@
 ---
 key_path: usage_activity_by_stage.manage.issues_imported.jira
-description: 'Distinct count of users that imported issues into projects using Jira'
+description: Distinct count of users that imported issues into projects using Jira
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180724_fogbugz.yml b/config/metrics/counts_all/20210216180724_fogbugz.yml
index 10d17be686f..2224b5dd717 100644
--- a/config/metrics/counts_all/20210216180724_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180724_fogbugz.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180726_phabricator.yml b/config/metrics/counts_all/20210216180726_phabricator.yml
index 0577a90db41..a735d6f5cdb 100644
--- a/config/metrics/counts_all/20210216180726_phabricator.yml
+++ b/config/metrics/counts_all/20210216180726_phabricator.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180727_csv.yml b/config/metrics/counts_all/20210216180727_csv.yml
index a48e48f1c26..5a06c5e8238 100644
--- a/config/metrics/counts_all/20210216180727_csv.yml
+++ b/config/metrics/counts_all/20210216180727_csv.yml
@@ -10,6 +10,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180729_groups_imported.yml b/config/metrics/counts_all/20210216180729_groups_imported.yml
index 605896d6fa9..2d0e40959b1 100644
--- a/config/metrics/counts_all/20210216180729_groups_imported.yml
+++ b/config/metrics/counts_all/20210216180729_groups_imported.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
index a379aa6d487..cd69803d569 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
index 456fec8b74b..ee44817090a 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
index 253c34e6119..a7670d1578b 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
index a37267faa22..1968f26c08e 100644
--- a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
+++ b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
index 9b36290a588..087afae23ad 100644
--- a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
+++ b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
index fd623d3643b..874e5a60243 100644
--- a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
+++ b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index a436a71d9c4..4374ebcb9c1 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180754_events.yml b/config/metrics/counts_all/20210216180754_events.yml
index 79276dce069..e580df4d511 100644
--- a/config/metrics/counts_all/20210216180754_events.yml
+++ b/config/metrics/counts_all/20210216180754_events.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index 021b074e670..e789713fc31 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index 35c8e40b5ee..1e722716546 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180800_ldap_keys.yml b/config/metrics/counts_all/20210216180800_ldap_keys.yml
index 628d95622c3..b3c97800b9b 100644
--- a/config/metrics/counts_all/20210216180800_ldap_keys.yml
+++ b/config/metrics/counts_all/20210216180800_ldap_keys.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180801_ldap_users.yml b/config/metrics/counts_all/20210216180801_ldap_users.yml
index e1673611bfb..075189ba9b7 100644
--- a/config/metrics/counts_all/20210216180801_ldap_users.yml
+++ b/config/metrics/counts_all/20210216180801_ldap_users.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
index c31d84584f3..09816e1b0f1 100644
--- a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
+++ b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
index 5d7be853eef..6ce96c5750d 100644
--- a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
index 32193b66e8b..0460ddd1ca4 100644
--- a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
index af991899476..3c1bb134c17 100644
--- a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180945_clusters.yml b/config/metrics/counts_all/20210216180945_clusters.yml
index 5ba6ed33fba..25a52cf9ffa 100644
--- a/config/metrics/counts_all/20210216180945_clusters.yml
+++ b/config/metrics/counts_all/20210216180945_clusters.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
index c408ca57516..cc15b3563b5 100644
--- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
index 7bd40023876..f037d7ea5c2 100644
--- a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
index 0f9f10bd321..fc362feda69 100644
--- a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
index 7c1c318a59d..6f6f4b00d1a 100644
--- a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181009_lfs_objects.yml b/config/metrics/counts_all/20210216181009_lfs_objects.yml
index 8d2f372b0f7..fe221ae2c47 100644
--- a/config/metrics/counts_all/20210216181009_lfs_objects.yml
+++ b/config/metrics/counts_all/20210216181009_lfs_objects.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181012_packages.yml b/config/metrics/counts_all/20210216181012_packages.yml
index 59161ebb3fd..2843f223d9e 100644
--- a/config/metrics/counts_all/20210216181012_packages.yml
+++ b/config/metrics/counts_all/20210216181012_packages.yml
@@ -11,5 +11,6 @@ time_frame: all
 data_source: database
 distribution:
 - ce
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
index 25f3f7d49a8..69b893251ac 100644
--- a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
+++ b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
index d9e2c7a6dce..9e06674dc61 100644
--- a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
+++ b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
index 17bed197c8c..907fa82882c 100644
--- a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
+++ b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
index 6136690f20e..55ae6fc7a24 100644
--- a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
index c2dd83f07d0..2e0bb6e06f5 100644
--- a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
index 3fef8c9b229..5b6ec558b76 100644
--- a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
+++ b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
index e2e99b914b7..6028972324d 100644
--- a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
+++ b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
index a979c1c9608..c1bd230ec5b 100644
--- a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
index 12e44ab2541..fc2e647a05e 100644
--- a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
index c288913d2e4..e8816d6f4f2 100644
--- a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
+++ b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
index 706e15d627e..367eae45062 100644
--- a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
+++ b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
index dbf2fdd1432..f89b6ef698e 100644
--- a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
+++ b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181051_vendor.yml b/config/metrics/counts_all/20210216181051_vendor.yml
index b2daa35c9da..1233659fa5c 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -10,6 +10,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181055_projects_with_packages.yml b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
index ce7b6dd8b49..55ea64a66a8 100644
--- a/config/metrics/counts_all/20210216181055_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
@@ -11,5 +11,6 @@ time_frame: all
 data_source:
 distribution:
 - ce
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181104_label_lists.yml b/config/metrics/counts_all/20210216181104_label_lists.yml
index 911d4f258ef..e064fe310b5 100644
--- a/config/metrics/counts_all/20210216181104_label_lists.yml
+++ b/config/metrics/counts_all/20210216181104_label_lists.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181106_milestone_lists.yml b/config/metrics/counts_all/20210216181106_milestone_lists.yml
index 75e49ecea78..138ad791d5a 100644
--- a/config/metrics/counts_all/20210216181106_milestone_lists.yml
+++ b/config/metrics/counts_all/20210216181106_milestone_lists.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181108_milestones.yml b/config/metrics/counts_all/20210216181108_milestones.yml
index 18f79a3145f..d0be9293cfc 100644
--- a/config/metrics/counts_all/20210216181108_milestones.yml
+++ b/config/metrics/counts_all/20210216181108_milestones.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml
index 65a9b566199..2f751d47d2c 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181117_notes.yml b/config/metrics/counts_all/20210216181117_notes.yml
index 63303cc3991..a948750b747 100644
--- a/config/metrics/counts_all/20210216181117_notes.yml
+++ b/config/metrics/counts_all/20210216181117_notes.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181119_projects.yml b/config/metrics/counts_all/20210216181119_projects.yml
index ee30d955965..807d2851393 100644
--- a/config/metrics/counts_all/20210216181119_projects.yml
+++ b/config/metrics/counts_all/20210216181119_projects.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181121_todos.yml b/config/metrics/counts_all/20210216181121_todos.yml
index fb2d6ee8793..2869e59033e 100644
--- a/config/metrics/counts_all/20210216181121_todos.yml
+++ b/config/metrics/counts_all/20210216181121_todos.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
index be28072475d..867a772eb23 100644
--- a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181124_service_desk_issues.yml b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
index a1ba75ad24e..47e80110c66 100644
--- a/config/metrics/counts_all/20210216181124_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181126_projects_jira_active.yml b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
index 2e55adfe11a..f0a5f3f711a 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
index 852c02d00c3..cb5f0a0f5ba 100644
--- a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
index e0f96eb5d52..aae3322de19 100644
--- a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181134_epics.yml b/config/metrics/counts_all/20210216181134_epics.yml
index db1c4546c6a..5d6825f0830 100644
--- a/config/metrics/counts_all/20210216181134_epics.yml
+++ b/config/metrics/counts_all/20210216181134_epics.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181135_label_lists.yml b/config/metrics/counts_all/20210216181135_label_lists.yml
index de9fdd8dbd3..4cd9374cdbb 100644
--- a/config/metrics/counts_all/20210216181135_label_lists.yml
+++ b/config/metrics/counts_all/20210216181135_label_lists.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181137_milestone_lists.yml b/config/metrics/counts_all/20210216181137_milestone_lists.yml
index 0570e3d8220..d0741ebd0b3 100644
--- a/config/metrics/counts_all/20210216181137_milestone_lists.yml
+++ b/config/metrics/counts_all/20210216181137_milestone_lists.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181205_confidential_epics.yml b/config/metrics/counts_all/20210216181205_confidential_epics.yml
index 47eb853c760..f2941af6bd2 100644
--- a/config/metrics/counts_all/20210216181205_confidential_epics.yml
+++ b/config/metrics/counts_all/20210216181205_confidential_epics.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181206_epics.yml b/config/metrics/counts_all/20210216181206_epics.yml
index 44e00ec6e74..97452db6f85 100644
--- a/config/metrics/counts_all/20210216181206_epics.yml
+++ b/config/metrics/counts_all/20210216181206_epics.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181210_issues_with_health_status.yml b/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
index 72974f683b9..1df3a5d1a38 100644
--- a/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
+++ b/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181249_feature_flags.yml b/config/metrics/counts_all/20210216181249_feature_flags.yml
index 86ed1f466bf..9ff71ff0e3b 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181252_boards.yml b/config/metrics/counts_all/20210216181252_boards.yml
index 54302a9de95..9316320129f 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index 9f4af2bc0a5..b2cd3039fcb 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181908_deploy_keys.yml b/config/metrics/counts_all/20210216181908_deploy_keys.yml
index 5f64e686aac..ce4034aca60 100644
--- a/config/metrics/counts_all/20210216181908_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216181908_deploy_keys.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181911_successful_deployments.yml b/config/metrics/counts_all/20210216181911_successful_deployments.yml
index 2eb244e501d..2eedd96e4b6 100644
--- a/config/metrics/counts_all/20210216181911_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181911_successful_deployments.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181912_failed_deployments.yml b/config/metrics/counts_all/20210216181912_failed_deployments.yml
index ac5acbc8681..3ef38fff2d3 100644
--- a/config/metrics/counts_all/20210216181912_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181912_failed_deployments.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181914_environments.yml b/config/metrics/counts_all/20210216181914_environments.yml
index 03ec05753da..cae8fb0d85b 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181916_in_review_folder.yml b/config/metrics/counts_all/20210216181916_in_review_folder.yml
index 87e9a9b2e8c..8890c0af74e 100644
--- a/config/metrics/counts_all/20210216181916_in_review_folder.yml
+++ b/config/metrics/counts_all/20210216181916_in_review_folder.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181918_releases.yml b/config/metrics/counts_all/20210216181918_releases.yml
index c6b517c997c..190a2ae92bc 100644
--- a/config/metrics/counts_all/20210216181918_releases.yml
+++ b/config/metrics/counts_all/20210216181918_releases.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml b/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
index 5fe39102d21..c0748285bf9 100644
--- a/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
+++ b/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181926_deployments.yml b/config/metrics/counts_all/20210216181926_deployments.yml
index 8b4c0d880ee..626b9b0b29b 100644
--- a/config/metrics/counts_all/20210216181926_deployments.yml
+++ b/config/metrics/counts_all/20210216181926_deployments.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181928_failed_deployments.yml b/config/metrics/counts_all/20210216181928_failed_deployments.yml
index 3873612c250..eec1fafa71c 100644
--- a/config/metrics/counts_all/20210216181928_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181928_failed_deployments.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181930_releases.yml b/config/metrics/counts_all/20210216181930_releases.yml
index 1df40b9091d..9beda5cb6db 100644
--- a/config/metrics/counts_all/20210216181930_releases.yml
+++ b/config/metrics/counts_all/20210216181930_releases.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181932_successful_deployments.yml b/config/metrics/counts_all/20210216181932_successful_deployments.yml
index 792f6cdc32a..48103574cfd 100644
--- a/config/metrics/counts_all/20210216181932_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181932_successful_deployments.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml b/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
index a7f5f5135b6..ce760884642 100644
--- a/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
+++ b/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181946_pages_domains.yml b/config/metrics/counts_all/20210216181946_pages_domains.yml
index 9a6f8f89ffb..7640b27eb46 100644
--- a/config/metrics/counts_all/20210216181946_pages_domains.yml
+++ b/config/metrics/counts_all/20210216181946_pages_domains.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml b/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml
index 751851e7a0e..4d520d3430f 100644
--- a/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml
+++ b/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml b/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
index 96be104fb41..926ed501639 100644
--- a/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
+++ b/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182001_protected_branches.yml b/config/metrics/counts_all/20210216182001_protected_branches.yml
index 3e5d187257f..cbd378bd93a 100644
--- a/config/metrics/counts_all/20210216182001_protected_branches.yml
+++ b/config/metrics/counts_all/20210216182001_protected_branches.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index 3db41295b00..f344a7c1640 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index d453a636de7..2e427d14acd 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index 835d902fcba..824761adaee 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182008_template_repositories.yml b/config/metrics/counts_all/20210216182008_template_repositories.yml
index c99ee4d2fb9..888f5d96ab6 100644
--- a/config/metrics/counts_all/20210216182008_template_repositories.yml
+++ b/config/metrics/counts_all/20210216182008_template_repositories.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182010_deploy_keys.yml b/config/metrics/counts_all/20210216182010_deploy_keys.yml
index 2a5436182b7..2ddc48c2e0a 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182012_keys.yml b/config/metrics/counts_all/20210216182012_keys.yml
index 29e4862dee1..1872abc6776 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
index e6973d6c52a..62883077ad5 100644
--- a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
index e717544f225..8518e3700bb 100644
--- a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182017_remote_mirrors.yml b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
index f24315fb3ab..f9edec7260b 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml b/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
index 249d9e5767d..3ccbc99a4f1 100644
--- a/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
+++ b/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml b/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
index 1733e5a888a..fcba0993477 100644
--- a/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
+++ b/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml b/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
index 5f3bad108f3..a850295aea6 100644
--- a/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
+++ b/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182025_protected_branches.yml b/config/metrics/counts_all/20210216182025_protected_branches.yml
index 762d04e0353..f914c5dae6c 100644
--- a/config/metrics/counts_all/20210216182025_protected_branches.yml
+++ b/config/metrics/counts_all/20210216182025_protected_branches.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml b/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
index 6943e1f3823..9ce0b935888 100644
--- a/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
+++ b/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml b/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
index d8c67c2762c..136472a59e4 100644
--- a/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
+++ b/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
index d87fb4ee300..66f616f16ee 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
index beed1de8083..a96a88e9dab 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
index cae90a52166..caf9633e57f 100644
--- a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
index fde49032ab6..9d911c6becf 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
index 12b9c67a5ff..25f6a6468d7 100644
--- a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
index 68bd00c0e5d..97bfc3d2301 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
index 30bba4e49f1..6cbbcadbe04 100644
--- a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
index aed0c97478f..a0c8d827951 100644
--- a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
index c2bf34fb4c6..d41905af3b6 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
index 12461a33bcb..0ef26b5b144 100644
--- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
index 6d1149d2fa7..29d73ebb943 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
index dda19cc2b1e..8b6da149dfa 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
index a11c50d4573..995849e5945 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
index b691e810c27..1e7377ed707 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
index 52d84bee3d1..adf7175c7c6 100644
--- a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
index ecf2d6b5e57..654ffad1ba6 100644
--- a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
index 55fa1125948..41958f501b7 100644
--- a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
index 612cf5c3835..63bafcd95d7 100644
--- a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
index 9d06c8dced6..994e9665ff1 100644
--- a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
index ebe99ce9117..c12bcfc76ae 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
index f947308dfb8..414d3723f9b 100644
--- a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
index 2d407101d32..48397435310 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
index dd456363f93..671c0574892 100644
--- a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
index 51343925ff0..895e0f03505 100644
--- a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
index eb87e9477a0..27206fb724f 100644
--- a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
index 2192c163b09..fb26328eb81 100644
--- a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
+++ b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
index f673d1a18db..010067763b5 100644
--- a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
+++ b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
index 6ce79e1d39d..11ccbf3b27e 100644
--- a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
+++ b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
index 78423ca79f2..9091fc299ee 100644
--- a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
+++ b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
index e3fddb68b27..91cea7e5f4f 100644
--- a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
+++ b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
index 22f290e7bdc..4b4e08c0631 100644
--- a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
+++ b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
index cdc2bcced0a..b87bc78265c 100644
--- a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
+++ b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
index 9f082923bd9..4ca264fc57f 100644
--- a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
+++ b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
index f36c916bca7..ea30df537f2 100644
--- a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
+++ b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
index 5e9cd1a42b5..e05cbbdc3a9 100644
--- a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
+++ b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
index 0bde9bcf141..6e0635e7108 100644
--- a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
+++ b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
index ecb58883b4a..818d32cf911 100644
--- a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
+++ b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
index 71e1d70c150..3bec73ead90 100644
--- a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
+++ b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
index 1522efae9d9..4ac31ac255b 100644
--- a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
index c8f53664fc9..8a3cb104b6a 100644
--- a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
index 0f3d72834b2..c0bf7f79ebc 100644
--- a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
+++ b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
index 2cd04408994..e38a6a4910e 100644
--- a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
+++ b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
index 34b2c5bab88..29e08dd04fe 100644
--- a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
+++ b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
index 21d9696e273..9dbd7572df6 100644
--- a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
+++ b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
index 46cfc1d0bed..9dda1569073 100644
--- a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
+++ b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
index 029f3b9a8e2..8a0399ca1be 100644
--- a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
+++ b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
index 964c65adaee..5c83f5533d0 100644
--- a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
+++ b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
index 196bed48d96..5ebdc064a11 100644
--- a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
+++ b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
index 533cfeadb31..6749fba2c3b 100644
--- a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
+++ b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
index dc66d6f66c4..f329104f2b2 100644
--- a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
+++ b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
index b4d2f70fa22..b8653d5a27e 100644
--- a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
+++ b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
index b1af1cf8a0c..54799778680 100644
--- a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
+++ b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
index b68905eb94f..c9c5f43627a 100644
--- a/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
+++ b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
index 40219ac3944..1f410f5ae95 100644
--- a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
+++ b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
index ea9add45c17..4b7abb5af70 100644
--- a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
+++ b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
index fb69e921d9c..3812514b79d 100644
--- a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
+++ b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
index 05cae6f9291..dd3c335235b 100644
--- a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
+++ b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
index 6e3c9256604..1114eb321ca 100644
--- a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
index 02cab4c77ed..f76cac6886b 100644
--- a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
index 6d0177b29b9..fa4ee39ed81 100644
--- a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
index d0ce8adcb3a..2905f0fa31a 100644
--- a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
+++ b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
index dcc2ecf99ef..920875186bd 100644
--- a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
index 0e21f3de59d..a360e34eaec 100644
--- a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml b/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
index d8417010c12..5fd7d2b3ee3 100644
--- a/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
index 5a2d3914631..a943cce5ecb 100644
--- a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
+++ b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
index c23c85d3c22..a15794a05f1 100644
--- a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
+++ b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
index c4dccc2bfef..ea0c217997a 100644
--- a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
+++ b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
index c9dfc633b4d..c35c455e5d7 100644
--- a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
+++ b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
index 3b3a4bae185..7b2f0fcca5b 100644
--- a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
+++ b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
index 1e4edd66f2c..6f5a0bc7a8b 100644
--- a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
+++ b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
index 7913155f788..f9d6124b57a 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml b/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
index c782cd256fd..77fe44a1836 100644
--- a/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
+++ b/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml b/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
index 75aff69054c..fc0ed6e5429 100644
--- a/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
+++ b/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183241_filesystems.yml b/config/metrics/counts_all/20210216183241_filesystems.yml
index 5acb7028548..ffb3f0d5cca 100644
--- a/config/metrics/counts_all/20210216183241_filesystems.yml
+++ b/config/metrics/counts_all/20210216183241_filesystems.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183248_pg_system_id.yml b/config/metrics/counts_all/20210216183248_pg_system_id.yml
index 024d341c66b..72d97c5db54 100644
--- a/config/metrics/counts_all/20210216183248_pg_system_id.yml
+++ b/config/metrics/counts_all/20210216183248_pg_system_id.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml b/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
index 720a191fd27..a2f3c2a6002 100644
--- a/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
+++ b/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183344_users_using_path_locks.yml b/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
index 33722dc3e64..f75db6ede2e 100644
--- a/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
+++ b/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml b/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
index 0e61403ba6a..b232c6bbb41 100644
--- a/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
+++ b/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml b/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
index cc4797d8a6b..4afb690ddc4 100644
--- a/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
+++ b/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml b/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
index dba7a0f595c..3ef906e10da 100644
--- a/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
+++ b/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml b/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
index 2a379221602..1397b1b57e2 100644
--- a/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
+++ b/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index 3d3b1cbf101..ab73b3fca22 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183402_two-factor.yml b/config/metrics/counts_all/20210216183402_two-factor.yml
index 35640d20a1a..777d4d1cdef 100644
--- a/config/metrics/counts_all/20210216183402_two-factor.yml
+++ b/config/metrics/counts_all/20210216183402_two-factor.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml b/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
index d2e4d9cfc6a..99c1f289658 100644
--- a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
+++ b/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml b/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
index 21f97e1e9b9..1ea27e42ed0 100644
--- a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
+++ b/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183408_standard.yml b/config/metrics/counts_all/20210216183408_standard.yml
index a55a7123ea9..55b4a984ae2 100644
--- a/config/metrics/counts_all/20210216183408_standard.yml
+++ b/config/metrics/counts_all/20210216183408_standard.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183410_google_oauth2.yml b/config/metrics/counts_all/20210216183410_google_oauth2.yml
index 92b66a98f88..c2fd5fad5ff 100644
--- a/config/metrics/counts_all/20210216183410_google_oauth2.yml
+++ b/config/metrics/counts_all/20210216183410_google_oauth2.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml b/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
index e5b965839cc..b7f7eea5f71 100644
--- a/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
+++ b/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml b/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml
index 8948d543bda..03e450d3438 100644
--- a/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml
+++ b/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml b/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml
index 75177a22b7c..bd4ef926805 100644
--- a/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml
+++ b/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml b/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml
index ba21c45e75d..c7581cc01dc 100644
--- a/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml
+++ b/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml b/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml
index c9087fbad89..af0d8417863 100644
--- a/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml
+++ b/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml b/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml
index 98ec7644a29..caf8da049d5 100644
--- a/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml
+++ b/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml b/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml
index 378b65f21d0..fb67caaa03e 100644
--- a/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml
+++ b/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml
@@ -9,6 +9,8 @@ value_type: number
 status: data_available
 time_frame: all
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/license/20210204124854_license_management_jobs.yml b/config/metrics/license/20210204124854_license_management_jobs.yml
index f89df165662..81e3e17e24b 100644
--- a/config/metrics/license/20210204124854_license_management_jobs.yml
+++ b/config/metrics/license/20210204124854_license_management_jobs.yml
@@ -9,7 +9,8 @@ value_type: number
 status: data_available
 time_frame: none
 data_source: database
-distribution: []
+distribution:
+- ce
 tier:
 - premium
 - ultimate
diff --git a/config/metrics/license/20210204124926_license_trial_ends_on.yml b/config/metrics/license/20210204124926_license_trial_ends_on.yml
index 6e78c6239e9..e3c3303975f 100644
--- a/config/metrics/license/20210204124926_license_trial_ends_on.yml
+++ b/config/metrics/license/20210204124926_license_trial_ends_on.yml
@@ -9,6 +9,8 @@ value_type: string
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/license/20210204124928_version.yml b/config/metrics/license/20210204124928_version.yml
index a5e8acb1eaa..b39552b220e 100644
--- a/config/metrics/license/20210204124928_version.yml
+++ b/config/metrics/license/20210204124928_version.yml
@@ -9,6 +9,8 @@ value_type: string
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/license/20210204124936_version.yml b/config/metrics/license/20210204124936_version.yml
index f9c28d40d3d..2d161e15fd0 100644
--- a/config/metrics/license/20210204124936_version.yml
+++ b/config/metrics/license/20210204124936_version.yml
@@ -9,6 +9,8 @@ value_type: string
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
index bc8a3e57b45..8afcd1bab02 100644
--- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml
+++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml
@@ -12,5 +12,6 @@ data_source:
 distribution:
 - ce
 - ee
-tier: []
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/license/20210216175609_version.yml b/config/metrics/license/20210216175609_version.yml
index 01a8a7247b5..fd707691e6d 100644
--- a/config/metrics/license/20210216175609_version.yml
+++ b/config/metrics/license/20210216175609_version.yml
@@ -9,6 +9,8 @@ value_type: string
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/license/20210216181053_version.yml b/config/metrics/license/20210216181053_version.yml
index 8a253907119..3570a041b8f 100644
--- a/config/metrics/license/20210216181053_version.yml
+++ b/config/metrics/license/20210216181053_version.yml
@@ -9,6 +9,8 @@ value_type: string
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/license/20210216183237_version.yml b/config/metrics/license/20210216183237_version.yml
index f086834ad6f..4f74963801a 100644
--- a/config/metrics/license/20210216183237_version.yml
+++ b/config/metrics/license/20210216183237_version.yml
@@ -9,6 +9,8 @@ value_type: string
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/schema.json b/config/metrics/schema.json
index d71eddab469..53e52c21545 100644
--- a/config/metrics/schema.json
+++ b/config/metrics/schema.json
@@ -22,7 +22,7 @@
     },
     "value_type": {
       "type": "string",
-      "enum": ["integer", "string", "number", "boolean"]
+      "enum": ["string", "number", "boolean"]
     },
     "status": {
       "type": ["string"],
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index 41f6d432b78..6f05eacbe5a 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index 53567998a76..6c50cb9144e 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index cecb9035dc6..01feb7157d9 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index 5cdb62237e4..ed9491959ae 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index 7102c96332a..21758753b35 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index b0bdeded7d9..6dc1a62d337 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index 7082b6c4ec5..425f3c44511 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 10483bd977b..f9e691b0516 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
index 0e6199e9976..ca829933eda 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index 50b08c15919..f9566076c9e 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index 82defcf4014..f2fb58e33ec 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index 49d997bd2a8..051d3933316 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
index d3eb20e93fd..4f21c0f2f18 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
index a78936d3324..596ae1384ca 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124924_elasticsearch_enabled.yml b/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
index 4b7d560b4ef..a9d1646d8d8 100644
--- a/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
+++ b/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/config/metrics/settings/20210204124934_enabled.yml b/config/metrics/settings/20210204124934_enabled.yml
index 3f4c8653dd1..2f2586ad8f4 100644
--- a/config/metrics/settings/20210204124934_enabled.yml
+++ b/config/metrics/settings/20210204124934_enabled.yml
@@ -9,6 +9,8 @@ value_type: boolean
 status: data_available
 time_frame: none
 data_source:
-distribution: []
-tier: []
+distribution:
+- ce
+tier:
+- free
 skip_validation: true
diff --git a/doc/administration/object_storage.md b/doc/administration/object_storage.md
index 3cad18dc497..a14f902db91 100644
--- a/doc/administration/object_storage.md
+++ b/doc/administration/object_storage.md
@@ -570,13 +570,15 @@ See the following additional guides:
 
 ## Warnings, limitations, and known issues
 
-### Separate buckets required when using Helm
+### Use separate buckets
 
-Generally, using the same bucket for your Object Storage is fine to do
-for convenience.
+Using separate buckets for each data type is the recommended approach for GitLab.
+This ensures there are no collisions across the various types of data GitLab stores.
+There are plans to [enable the use of a single bucket](https://gitlab.com/gitlab-org/gitlab/-/issues/292958)
+in the future.
 
-However, if you're using or planning to use Helm, separate buckets will
-be required as there is a [known limitation with restorations of Helm chart backups](https://docs.gitlab.com/charts/advanced/external-object-storage/#lfs-artifacts-uploads-packages-external-diffs-pseudonymizer).
+Helm-based installs require separate buckets to
+[handle backup restorations](https://docs.gitlab.com/charts/advanced/external-object-storage/#lfs-artifacts-uploads-packages-external-diffs-pseudonymizer)
 
 ### S3 API compatibility issues
 
diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md
index 01925e272d3..d6a38e1b713 100644
--- a/doc/administration/reference_architectures/10k_users.md
+++ b/doc/administration/reference_architectures/10k_users.md
@@ -1940,13 +1940,13 @@ To configure the Sidekiq nodes, on each one:
      'google_project' => '<gcp-project-name>',
      'google_json_key_location' => '<path-to-gcp-service-account-key>'
    }
-   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-bucket-name>"
+   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-artifacts-bucket-name>"
+   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-external-diffs-bucket-name>"
+   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-lfs-bucket-name>"
+   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-uploads-bucket-name>"
+   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-packages-bucket-name>"
+   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-dependency-proxy-bucket-name>"
+   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-terraform-state-bucket-name>"
    ```
 
 1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace
@@ -2069,13 +2069,13 @@ On each node perform the following:
      'google_project' => '<gcp-project-name>',
      'google_json_key_location' => '<path-to-gcp-service-account-key>'
    }
-   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-bucket-name>"
+   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-artifacts-bucket-name>"
+   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-external-diffs-bucket-name>"
+   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-lfs-bucket-name>"
+   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-uploads-bucket-name>"
+   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-packages-bucket-name>"
+   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-dependency-proxy-bucket-name>"
+   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-terraform-state-bucket-name>"
    ```
 
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
@@ -2303,20 +2303,9 @@ on what features you intend to use:
 | [Terraform state files](../terraform_state.md#using-object-storage) | Yes |
 
 Using separate buckets for each data type is the recommended approach for GitLab.
-
-A limitation of our configuration is that each use of object storage is separately configured.
-[We have an issue for improving this](https://gitlab.com/gitlab-org/gitlab/-/issues/23345)
-and easily using one bucket with separate folders is one improvement that this might bring.
-
-There is at least one specific issue with using the same bucket:
-when GitLab is deployed with the Helm chart restore from backup
-[will not properly function](https://docs.gitlab.com/charts/advanced/external-object-storage/#lfs-artifacts-uploads-packages-external-diffs-pseudonymizer)
-unless separate buckets are used.
-
-One risk of using a single bucket would be if your organization decided to
-migrate GitLab to the Helm deployment in the future. GitLab would run, but the situation with
-backups might not be realized until the organization had a critical requirement for the backups to
-work.
+This ensures there are no collisions across the various types of data GitLab stores.
+There are plans to [enable the use of a single bucket](https://gitlab.com/gitlab-org/gitlab/-/issues/292958)
+in the future.
 
 <div align="right">
   <a type="button" class="btn btn-default" href="#setup-components">
diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md
index 48c72bb930d..d02f7ea66ac 100644
--- a/doc/administration/reference_architectures/25k_users.md
+++ b/doc/administration/reference_architectures/25k_users.md
@@ -1637,13 +1637,13 @@ To configure the Sidekiq nodes, on each one:
      'google_project' => '<gcp-project-name>',
      'google_json_key_location' => '<path-to-gcp-service-account-key>'
    }
-   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-bucket-name>"
+   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-artifacts-bucket-name>"
+   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-external-diffs-bucket-name>"
+   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-lfs-bucket-name>"
+   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-uploads-bucket-name>"
+   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-packages-bucket-name>"
+   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-dependency-proxy-bucket-name>"
+   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-terraform-state-bucket-name>"
    ```
 
 1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace
@@ -1769,13 +1769,13 @@ On each node perform the following:
      'google_project' => '<gcp-project-name>',
      'google_json_key_location' => '<path-to-gcp-service-account-key>'
    }
-   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-bucket-name>"
+   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-artifacts-bucket-name>"
+   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-external-diffs-bucket-name>"
+   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-lfs-bucket-name>"
+   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-uploads-bucket-name>"
+   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-packages-bucket-name>"
+   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-dependency-proxy-bucket-name>"
+   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-terraform-state-bucket-name>"
    ```
 
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
@@ -2002,20 +2002,9 @@ on what features you intend to use:
 | [Terraform state files](../terraform_state.md#using-object-storage) | Yes |
 
 Using separate buckets for each data type is the recommended approach for GitLab.
-
-A limitation of our configuration is that each use of object storage is separately configured.
-[We have an issue for improving this](https://gitlab.com/gitlab-org/gitlab/-/issues/23345)
-and easily using one bucket with separate folders is one improvement that this might bring.
-
-There is at least one specific issue with using the same bucket:
-when GitLab is deployed with the Helm chart restore from backup
-[will not properly function](https://docs.gitlab.com/charts/advanced/external-object-storage/#lfs-artifacts-uploads-packages-external-diffs-pseudonymizer)
-unless separate buckets are used.
-
-One risk of using a single bucket would be if your organization decided to
-migrate GitLab to the Helm deployment in the future. GitLab would run, but the situation with
-backups might not be realized until the organization had a critical requirement for the backups to
-work.
+This ensures there are no collisions across the various types of data GitLab stores.
+There are plans to [enable the use of a single bucket](https://gitlab.com/gitlab-org/gitlab/-/issues/292958)
+in the future.
 
 <div align="right">
   <a type="button" class="btn btn-default" href="#setup-components">
diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md
index 9ad6054104a..62f0c993213 100644
--- a/doc/administration/reference_architectures/2k_users.md
+++ b/doc/administration/reference_architectures/2k_users.md
@@ -668,13 +668,13 @@ On each node perform the following:
      'google_project' => '<gcp-project-name>',
      'google_json_key_location' => '<path-to-gcp-service-account-key>'
    }
-   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-bucket-name>"
+   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-artifacts-bucket-name>"
+   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-external-diffs-bucket-name>"
+   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-lfs-bucket-name>"
+   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-uploads-bucket-name>"
+   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-packages-bucket-name>"
+   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-dependency-proxy-bucket-name>"
+   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-terraform-state-bucket-name>"
 
    ## Uncomment and edit the following options if you have set up NFS
    ##
@@ -920,18 +920,9 @@ on what features you intend to use:
 | [Terraform state files](../terraform_state.md#using-object-storage) | Yes |
 
 Using separate buckets for each data type is the recommended approach for GitLab.
-
-A limitation of our configuration is that each use of object storage is
-separately configured. We have an [issue](https://gitlab.com/gitlab-org/gitlab/-/issues/23345)
-for improving this, which would allow for one bucket with separate folders.
-
-Using a single bucket when GitLab is deployed with the Helm chart causes
-restoring from a backup to
-[not function properly](https://docs.gitlab.com/charts/advanced/external-object-storage/#lfs-artifacts-uploads-packages-external-diffs-pseudonymizer).
-Although you may not be using a Helm deployment right now, if you migrate
-GitLab to a Helm deployment later, GitLab would still work, but you may not
-realize backups aren't working correctly until a critical requirement for
-functioning backups is encountered.
+This ensures there are no collisions across the various types of data GitLab stores.
+There are plans to [enable the use of a single bucket](https://gitlab.com/gitlab-org/gitlab/-/issues/292958)
+in the future.
 
 <div align="right">
   <a type="button" class="btn btn-default" href="#setup-components">
diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md
index 175c4318d78..593bfaf7282 100644
--- a/doc/administration/reference_architectures/3k_users.md
+++ b/doc/administration/reference_architectures/3k_users.md
@@ -1322,13 +1322,14 @@ To configure the Sidekiq nodes, one each one:
      'google_project' => '<gcp-project-name>',
      'google_json_key_location' => '<path-to-gcp-service-account-key>'
    }
-   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-bucket-name>"
+   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-artifacts-bucket-name>"
+   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-external-diffs-bucket-name>"
+   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-lfs-bucket-name>"
+   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-uploads-bucket-name>"
+   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-packages-bucket-name>"
+   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-dependency-proxy-bucket-name>"
+   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-terraform-state-bucket-name>"
+
    ```
 
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
@@ -1489,13 +1490,13 @@ On each node perform the following:
      'google_project' => '<gcp-project-name>',
      'google_json_key_location' => '<path-to-gcp-service-account-key>'
    }
-   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-bucket-name>"
+   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-artifacts-bucket-name>"
+   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-external-diffs-bucket-name>"
+   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-lfs-bucket-name>"
+   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-uploads-bucket-name>"
+   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-packages-bucket-name>"
+   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-dependency-proxy-bucket-name>"
+   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-terraform-state-bucket-name>"
    ```
 
 1. If you're using [Gitaly with TLS support](#gitaly-tls-support), make sure the
@@ -1697,20 +1698,9 @@ on what features you intend to use:
 | [Terraform state files](../terraform_state.md#using-object-storage) | Yes |
 
 Using separate buckets for each data type is the recommended approach for GitLab.
-
-A limitation of our configuration is that each use of object storage is separately configured.
-[We have an issue for improving this](https://gitlab.com/gitlab-org/gitlab/-/issues/23345)
-and easily using one bucket with separate folders is one improvement that this might bring.
-
-There is at least one specific issue with using the same bucket:
-when GitLab is deployed with the Helm chart restore from backup
-[will not properly function](https://docs.gitlab.com/charts/advanced/external-object-storage/#lfs-artifacts-uploads-packages-external-diffs-pseudonymizer)
-unless separate buckets are used.
-
-One risk of using a single bucket would be if your organization decided to
-migrate GitLab to the Helm deployment in the future. GitLab would run, but the situation with
-backups might not be realized until the organization had a critical requirement for the backups to
-work.
+This ensures there are no collisions across the various types of data GitLab stores.
+There are plans to [enable the use of a single bucket](https://gitlab.com/gitlab-org/gitlab/-/issues/292958)
+in the future.
 
 <div align="right">
   <a type="button" class="btn btn-default" href="#setup-components">
diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md
index 0b22a2d3602..04ce39046d8 100644
--- a/doc/administration/reference_architectures/50k_users.md
+++ b/doc/administration/reference_architectures/50k_users.md
@@ -1637,13 +1637,13 @@ To configure the Sidekiq nodes, on each one:
      'google_project' => '<gcp-project-name>',
      'google_json_key_location' => '<path-to-gcp-service-account-key>'
    }
-   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-bucket-name>"
+   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-artifacts-bucket-name>"
+   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-external-diffs-bucket-name>"
+   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-lfs-bucket-name>"
+   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-uploads-bucket-name>"
+   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-packages-bucket-name>"
+   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-dependency-proxy-bucket-name>"
+   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-terraform-state-bucket-name>"
    ```
 
 1. Copy the `/etc/gitlab/gitlab-secrets.json` file from your Consul server, and replace
@@ -1769,13 +1769,13 @@ On each node perform the following:
      'google_project' => '<gcp-project-name>',
      'google_json_key_location' => '<path-to-gcp-service-account-key>'
    }
-   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-bucket-name>"
+   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-artifacts-bucket-name>"
+   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-external-diffs-bucket-name>"
+   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-lfs-bucket-name>"
+   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-uploads-bucket-name>"
+   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-packages-bucket-name>"
+   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-dependency-proxy-bucket-name>"
+   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-terraform-state-bucket-name>"
    ```
 
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
@@ -2002,20 +2002,9 @@ on what features you intend to use:
 | [Terraform state files](../terraform_state.md#using-object-storage) | Yes |
 
 Using separate buckets for each data type is the recommended approach for GitLab.
-
-A limitation of our configuration is that each use of object storage is separately configured.
-[We have an issue for improving this](https://gitlab.com/gitlab-org/gitlab/-/issues/23345)
-and easily using one bucket with separate folders is one improvement that this might bring.
-
-There is at least one specific issue with using the same bucket:
-when GitLab is deployed with the Helm chart restore from backup
-[will not properly function](https://docs.gitlab.com/charts/advanced/external-object-storage/#lfs-artifacts-uploads-packages-external-diffs-pseudonymizer)
-unless separate buckets are used.
-
-One risk of using a single bucket would be if your organization decided to
-migrate GitLab to the Helm deployment in the future. GitLab would run, but the situation with
-backups might not be realized until the organization had a critical requirement for the backups to
-work.
+This ensures there are no collisions across the various types of data GitLab stores.
+There are plans to [enable the use of a single bucket](https://gitlab.com/gitlab-org/gitlab/-/issues/292958)
+in the future.
 
 <div align="right">
   <a type="button" class="btn btn-default" href="#setup-components">
diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md
index 37d35c299fa..37e67b0ab73 100644
--- a/doc/administration/reference_architectures/5k_users.md
+++ b/doc/administration/reference_architectures/5k_users.md
@@ -1319,13 +1319,13 @@ To configure the Sidekiq nodes, one each one:
      'google_project' => '<gcp-project-name>',
      'google_json_key_location' => '<path-to-gcp-service-account-key>'
    }
-   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-bucket-name>"
+   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-artifacts-bucket-name>"
+   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-external-diffs-bucket-name>"
+   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-lfs-bucket-name>"
+   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-uploads-bucket-name>"
+   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-packages-bucket-name>"
+   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-dependency-proxy-bucket-name>"
+   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-terraform-state-bucket-name>"
    ```
 
 1. Save the file and [reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
@@ -1471,13 +1471,13 @@ On each node perform the following:
      'google_project' => '<gcp-project-name>',
      'google_json_key_location' => '<path-to-gcp-service-account-key>'
    }
-   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-bucket-name>"
-   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-bucket-name>"
+   gitlab_rails['object_store']['objects']['artifacts']['bucket'] = "<gcp-artifacts-bucket-name>"
+   gitlab_rails['object_store']['objects']['external_diffs']['bucket'] = "<gcp-external-diffs-bucket-name>"
+   gitlab_rails['object_store']['objects']['lfs']['bucket'] = "<gcp-lfs-bucket-name>"
+   gitlab_rails['object_store']['objects']['uploads']['bucket'] = "<gcp-uploads-bucket-name>"
+   gitlab_rails['object_store']['objects']['packages']['bucket'] = "<gcp-packages-bucket-name>"
+   gitlab_rails['object_store']['objects']['dependency_proxy']['bucket'] = "<gcp-dependency-proxy-bucket-name>"
+   gitlab_rails['object_store']['objects']['terraform_state']['bucket'] = "<gcp-terraform-state-bucket-name>"
 
    ## Uncomment and edit the following options if you have set up NFS
    ##
@@ -1694,20 +1694,9 @@ on what features you intend to use:
 | [Terraform state files](../terraform_state.md#using-object-storage) | Yes |
 
 Using separate buckets for each data type is the recommended approach for GitLab.
-
-A limitation of our configuration is that each use of object storage is separately configured.
-[We have an issue for improving this](https://gitlab.com/gitlab-org/gitlab/-/issues/23345)
-and easily using one bucket with separate folders is one improvement that this might bring.
-
-There is at least one specific issue with using the same bucket:
-when GitLab is deployed with the Helm chart restore from backup
-[will not properly function](https://docs.gitlab.com/charts/advanced/external-object-storage/#lfs-artifacts-uploads-packages-external-diffs-pseudonymizer)
-unless separate buckets are used.
-
-One risk of using a single bucket would be if your organization decided to
-migrate GitLab to the Helm deployment in the future. GitLab would run, but the situation with
-backups might not be realized until the organization had a critical requirement for the backups to
-work.
+This ensures there are no collisions across the various types of data GitLab stores.
+There are plans to [enable the use of a single bucket](https://gitlab.com/gitlab-org/gitlab/-/issues/292958)
+in the future.
 
 <div align="right">
   <a type="button" class="btn btn-default" href="#setup-components">
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 0c827d6bf49..41aa8f24d02 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -14826,6 +14826,11 @@ type Label {
   color: String!
 
   """
+  When this label was created.
+  """
+  createdAt: Time!
+
+  """
   Description of the label (Markdown rendered as HTML for caching).
   """
   description: String
@@ -14849,6 +14854,11 @@ type Label {
   Content of the label.
   """
   title: String!
+
+  """
+  When this label was last updated.
+  """
+  updatedAt: Time!
 }
 
 """
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index ccd5793b39c..e154872ee88 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -40479,6 +40479,24 @@
               "deprecationReason": null
             },
             {
+              "name": "createdAt",
+              "description": "When this label was created.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Time",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "description",
               "description": "Description of the label (Markdown rendered as HTML for caching).",
               "args": [
@@ -40559,6 +40577,24 @@
               },
               "isDeprecated": false,
               "deprecationReason": null
+            },
+            {
+              "name": "updatedAt",
+              "description": "When this label was last updated.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Time",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
             }
           ],
           "inputFields": null,
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 974958502e9..0b88261e809 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -2414,11 +2414,13 @@ Autogenerated return type of JiraImportUsers.
 | Field | Type | Description |
 | ----- | ---- | ----------- |
 | `color` | String! | Background color of the label. |
+| `createdAt` | Time! | When this label was created. |
 | `description` | String | Description of the label (Markdown rendered as HTML for caching). |
 | `descriptionHtml` | String | The GitLab Flavored Markdown rendering of `description` |
 | `id` | ID! | Label ID. |
 | `textColor` | String! | Text color of the label. |
 | `title` | String! | Content of the label. |
+| `updatedAt` | Time! | When this label was last updated. |
 
 ### LabelCreatePayload
 
diff --git a/doc/development/usage_ping/dictionary.md b/doc/development/usage_ping/dictionary.md
index c010cedf473..eb87412b825 100644
--- a/doc/development/usage_ping/dictionary.md
+++ b/doc/development/usage_ping/dictionary.md
@@ -63,8 +63,8 @@ Visits to any of the pages listed above per week
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.analytics_unique_visits_for_any_target_monthly`
@@ -82,8 +82,8 @@ Visits to any of the pages listed above per month
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.g_analytics_contribution`
@@ -101,8 +101,8 @@ Visits to /groups/:group/-/contribution_analytics
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.g_analytics_insights`
@@ -120,8 +120,8 @@ Visits to /groups/:group/-/insights
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.g_analytics_issues`
@@ -139,8 +139,8 @@ Visits to /groups/:group/-/issues_analytics
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.g_analytics_merge_request`
@@ -158,8 +158,8 @@ Visits to /groups/:group/-/analytics/merge_request_analytics
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.g_analytics_productivity`
@@ -177,8 +177,8 @@ Visits to /groups/:group/-/analytics/productivity_analytics
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.g_analytics_valuestream`
@@ -196,8 +196,8 @@ Visits to /groups/:group/-/analytics/value_stream_analytics
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.i_analytics_cohorts`
@@ -215,8 +215,8 @@ Visits to /-/instance_statistics/cohorts
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.i_analytics_dev_ops_score`
@@ -234,8 +234,8 @@ Visits to /-/instance_statistics/dev_ops_score
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.i_analytics_instance_statistics`
@@ -253,8 +253,8 @@ Visit to /admin/instance_statistics
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.p_analytics_code_reviews`
@@ -272,8 +272,8 @@ Visits to /:group/:project/-/analytics/code_reviews
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.p_analytics_insights`
@@ -291,8 +291,8 @@ Visits to /:group/:project/insights
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.p_analytics_issues`
@@ -310,8 +310,8 @@ Visits to /:group/:project/-/analytics/issues_analytics
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.p_analytics_merge_request`
@@ -329,8 +329,8 @@ Visits to /:group/:project/-/analytics/merge_request_analytics
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.p_analytics_pipelines`
@@ -348,8 +348,8 @@ Visits to /:group/:project/pipelines/charts
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.p_analytics_repo`
@@ -367,8 +367,8 @@ Visits to /:group/:project/-/graphs/master/charts
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `analytics_unique_visits.p_analytics_valuestream`
@@ -386,8 +386,8 @@ Visits to /:group/:project/-/value_stream_analytics
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `compliance_unique_visits.a_compliance_audit_events_api`
@@ -405,8 +405,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `compliance_unique_visits.compliance_unique_visits_for_any_target`
@@ -424,8 +424,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `compliance_unique_visits.compliance_unique_visits_for_any_target_monthly`
@@ -443,8 +443,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `compliance_unique_visits.g_compliance_audit_events`
@@ -462,8 +462,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `compliance_unique_visits.g_compliance_dashboard`
@@ -481,8 +481,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `compliance_unique_visits.i_compliance_audit_events`
@@ -500,8 +500,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `compliance_unique_visits.i_compliance_credential_inventory`
@@ -519,8 +519,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `container_registry_enabled`
@@ -538,8 +538,8 @@ Whether container registry is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `container_registry_server.vendor`
@@ -557,8 +557,8 @@ Identifies if a user is using an external container registry and what type
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `container_registry_server.version`
@@ -576,8 +576,8 @@ Identifies the version of the external registry being used
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.alert_bot_incident_issues`
@@ -633,8 +633,8 @@ Count of API Fuzzing `docker-in-docker` jobs run by job name
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.api_fuzzing_jobs`
@@ -652,8 +652,8 @@ Count of API Fuzzing jobs run by job name
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.assignee_lists`
@@ -690,8 +690,8 @@ Projects with Auto DevOps template disabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.auto_devops_enabled`
@@ -709,8 +709,8 @@ Projects with Auto DevOps template enabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.boards`
@@ -728,8 +728,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.ci_builds`
@@ -747,8 +747,8 @@ Unique builds in project
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.ci_external_pipelines`
@@ -766,8 +766,8 @@ Total pipelines in external repositories
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.ci_internal_pipelines`
@@ -785,8 +785,8 @@ Total pipelines in GitLab repositories
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.ci_pipeline_config_auto_devops`
@@ -804,8 +804,8 @@ Total pipelines from an Auto DevOps template
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.ci_pipeline_config_repository`
@@ -823,8 +823,8 @@ Total Pipelines from templates in repository
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.ci_pipeline_schedules`
@@ -842,8 +842,8 @@ Pipeline schedules in GitLab
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.ci_runners`
@@ -861,8 +861,8 @@ Total configured Runners in project
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.ci_triggers`
@@ -880,8 +880,8 @@ Total configured Triggers in project
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.clusters`
@@ -1222,8 +1222,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.confidential_epics`
@@ -1241,8 +1241,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.container_scanning_jobs`
@@ -1279,8 +1279,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.cycle_analytics_views`
@@ -1298,8 +1298,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.dast_jobs`
@@ -1317,8 +1317,8 @@ Count of DAST jobs run
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.dast_on_demand_pipelines`
@@ -1336,8 +1336,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.dependency_list_usages_total`
@@ -1393,8 +1393,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.deployments`
@@ -1431,8 +1431,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.design_management_designs_delete`
@@ -1450,8 +1450,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.design_management_designs_update`
@@ -1469,8 +1469,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.environments`
@@ -1488,8 +1488,8 @@ Total available and stopped environments
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.epic_issues`
@@ -1526,8 +1526,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.epics_deepest_relationship_level`
@@ -1564,8 +1564,8 @@ Total failed deployments
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.feature_flags`
@@ -1583,8 +1583,8 @@ Number of feature flag toggles
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.geo_event_log_max_id`
@@ -1617,7 +1617,7 @@ Total number of sites in a Geo deployment
 | `product_stage` | enablement |
 | `product_group` | `group::geo` |
 | `product_category` | `disaster_recovery` |
-| `value_type` | integer |
+| `value_type` | number |
 | `status` | data_available |
 | `milestone` | 11.2 |
 | `time_frame` | all |
@@ -1640,8 +1640,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.group_clusters_disabled`
@@ -1868,8 +1868,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.groups_discord_active`
@@ -1944,8 +1944,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.groups_external_wiki_active`
@@ -2210,8 +2210,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.groups_inheriting_discord_active`
@@ -2286,8 +2286,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.groups_inheriting_external_wiki_active`
@@ -2514,8 +2514,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.groups_inheriting_mock_monitoring_active`
@@ -2533,8 +2533,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.groups_inheriting_packagist_active`
@@ -2894,8 +2894,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.groups_mock_monitoring_active`
@@ -2913,8 +2913,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.groups_packagist_active`
@@ -3160,8 +3160,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.incident_issues`
@@ -3540,8 +3540,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.instances_discord_active`
@@ -3616,8 +3616,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.instances_external_wiki_active`
@@ -3844,8 +3844,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.instances_mock_monitoring_active`
@@ -3863,8 +3863,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.instances_packagist_active`
@@ -4148,8 +4148,8 @@ Count of issues manually created from the GitLab UI on Sentry errors
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.issues_created_gitlab_alerts`
@@ -4262,8 +4262,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.jira_imports_projects_count`
@@ -4338,8 +4338,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.kubernetes_agent_gitops_sync`
@@ -4414,8 +4414,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.labels`
@@ -4509,8 +4509,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.license_management_jobs`
@@ -4528,7 +4528,7 @@ Name on the GitLab license
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` | Database |
-| `distribution` |  |
+| `distribution` | ce |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
 
@@ -4566,8 +4566,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.merge_request_create`
@@ -4585,8 +4585,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.merge_requests`
@@ -4604,8 +4604,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.merged_merge_requests_using_approval_rules`
@@ -4623,8 +4623,8 @@ Count of merge requests merged using approval rules
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.milestone_lists`
@@ -4642,8 +4642,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.milestones`
@@ -4661,8 +4661,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.navbar_searches`
@@ -4756,8 +4756,8 @@ Active users with enabled operations dashboard
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.operations_dashboard_users_with_projects_added`
@@ -4775,8 +4775,8 @@ Active users with projects on operations dashboard
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_composer_delete_package`
@@ -4794,8 +4794,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_composer_pull_package`
@@ -4813,8 +4813,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_composer_push_package`
@@ -4832,8 +4832,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_conan_delete_package`
@@ -4851,8 +4851,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_conan_pull_package`
@@ -4870,8 +4870,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_conan_push_package`
@@ -4889,8 +4889,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_container_delete_package`
@@ -4908,8 +4908,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_container_pull_package`
@@ -4927,8 +4927,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_container_push_package`
@@ -4946,8 +4946,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_debian_delete_package`
@@ -4965,8 +4965,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_debian_pull_package`
@@ -4984,8 +4984,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_debian_push_package`
@@ -5003,8 +5003,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_delete_package`
@@ -5022,8 +5022,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_delete_package_by_deploy_token`
@@ -5041,8 +5041,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_delete_package_by_guest`
@@ -5060,8 +5060,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_delete_package_by_user`
@@ -5079,8 +5079,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_generic_delete_package`
@@ -5098,8 +5098,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_generic_pull_package`
@@ -5117,8 +5117,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_generic_push_package`
@@ -5136,8 +5136,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_golang_delete_package`
@@ -5155,8 +5155,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_golang_pull_package`
@@ -5174,8 +5174,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_golang_push_package`
@@ -5193,8 +5193,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_maven_delete_package`
@@ -5212,8 +5212,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_maven_pull_package`
@@ -5231,8 +5231,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_maven_push_package`
@@ -5250,8 +5250,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_npm_delete_package`
@@ -5269,8 +5269,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_npm_pull_package`
@@ -5288,8 +5288,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_npm_push_package`
@@ -5307,8 +5307,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_nuget_delete_package`
@@ -5326,8 +5326,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_nuget_pull_package`
@@ -5345,8 +5345,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_nuget_push_package`
@@ -5364,8 +5364,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_pull_package`
@@ -5383,8 +5383,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_pull_package_by_deploy_token`
@@ -5402,8 +5402,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_pull_package_by_guest`
@@ -5421,8 +5421,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_pull_package_by_user`
@@ -5440,8 +5440,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_push_package`
@@ -5459,8 +5459,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_push_package_by_deploy_token`
@@ -5478,8 +5478,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_push_package_by_guest`
@@ -5497,8 +5497,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_push_package_by_user`
@@ -5516,8 +5516,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_pypi_delete_package`
@@ -5535,8 +5535,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_pypi_pull_package`
@@ -5554,8 +5554,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_pypi_push_package`
@@ -5573,8 +5573,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_tag_delete_package`
@@ -5592,8 +5592,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_tag_pull_package`
@@ -5611,8 +5611,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.package_events_i_package_tag_push_package`
@@ -5630,8 +5630,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.packages`
@@ -5650,7 +5650,7 @@ Number of packages
 | `time_frame` | all |
 | `data_source` | Database |
 | `distribution` | ce |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.pages_domains`
@@ -5668,8 +5668,8 @@ Total GitLab Pages domains
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.personal_snippets`
@@ -5744,8 +5744,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.project_clusters_disabled`
@@ -5820,8 +5820,8 @@ Count of Projects
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_asana_active`
@@ -5972,8 +5972,8 @@ Counts of Projects that have created incidents
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_custom_issue_tracker_active`
@@ -6010,8 +6010,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_discord_active`
@@ -6086,8 +6086,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_external_wiki_active`
@@ -6200,8 +6200,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_inheriting_asana_active`
@@ -6371,8 +6371,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_inheriting_discord_active`
@@ -6447,8 +6447,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_inheriting_external_wiki_active`
@@ -6675,8 +6675,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_inheriting_mock_monitoring_active`
@@ -6694,8 +6694,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_inheriting_packagist_active`
@@ -7150,8 +7150,8 @@ Projects with repository mirroring enabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_mock_ci_active`
@@ -7169,8 +7169,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_mock_monitoring_active`
@@ -7188,8 +7188,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_packagist_active`
@@ -7435,8 +7435,8 @@ Count of projects with alerts created in given time period
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_alerts_service_enabled`
@@ -7473,8 +7473,8 @@ Count of projects with at least 1 enabled integration
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_error_tracking_enabled`
@@ -7511,8 +7511,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_expiration_policy_enabled`
@@ -7530,8 +7530,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_expiration_policy_enabled_with_cadence_set_to_14d`
@@ -7549,8 +7549,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_expiration_policy_enabled_with_cadence_set_to_1d`
@@ -7568,8 +7568,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_expiration_policy_enabled_with_cadence_set_to_1month`
@@ -7587,8 +7587,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_expiration_policy_enabled_with_cadence_set_to_3month`
@@ -7606,8 +7606,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_expiration_policy_enabled_with_cadence_set_to_7d`
@@ -7625,8 +7625,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_expiration_policy_enabled_with_keep_n_set_to_1`
@@ -7777,8 +7777,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_expiration_policy_enabled_with_older_than_set_to_30d`
@@ -7796,8 +7796,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_expiration_policy_enabled_with_older_than_set_to_7d`
@@ -7815,8 +7815,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_expiration_policy_enabled_with_older_than_set_to_90d`
@@ -7834,8 +7834,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_expiration_policy_enabled_with_older_than_unset`
@@ -7853,8 +7853,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_packages`
@@ -7891,8 +7891,8 @@ Projects with Prometheus alerting enabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_repositories_enabled`
@@ -7910,8 +7910,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_terraform_reports`
@@ -7929,8 +7929,8 @@ Count of projects with Terraform MR reports
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_terraform_states`
@@ -7948,8 +7948,8 @@ Count of projects with GitLab Managed Terraform State
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_with_tracing_enabled`
@@ -7967,8 +7967,8 @@ Projects with tracing enabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.projects_youtrack_active`
@@ -8005,8 +8005,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.protected_branches_except_default`
@@ -8024,8 +8024,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.releases`
@@ -8043,8 +8043,8 @@ Unique release tags
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.remote_mirrors`
@@ -8062,8 +8062,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.requirement_test_reports_ci`
@@ -8119,8 +8119,8 @@ Count of requirements created
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.requirements_with_test_report`
@@ -8196,7 +8196,7 @@ Count of service desk enabled projects
 | `time_frame` | all |
 | `data_source` | Database |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.service_desk_issues`
@@ -8215,7 +8215,7 @@ Count of service desk issues
 | `time_frame` | all |
 | `data_source` | Database |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.snippet_comment`
@@ -8309,8 +8309,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.static_site_editor_commits`
@@ -8328,8 +8328,8 @@ Count of commits created via Static Site Editor
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.static_site_editor_merge_requests`
@@ -8347,8 +8347,8 @@ Count of merge requests created via Static Site Editor
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.static_site_editor_views`
@@ -8385,8 +8385,8 @@ Cumulative count of usages of publish operation
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.status_page_incident_unpublishes`
@@ -8404,8 +8404,8 @@ Cumulative count of usages of unpublish operation
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.status_page_issues`
@@ -8423,8 +8423,8 @@ Issues published to a Status Page
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.status_page_projects`
@@ -8442,8 +8442,8 @@ Projects with status page enabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.successful_deployments`
@@ -8461,8 +8461,8 @@ Total successful deployments
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.suggestions`
@@ -8480,8 +8480,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.template_repositories`
@@ -8499,8 +8499,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.templates_asana_active`
@@ -8670,8 +8670,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.templates_discord_active`
@@ -8746,8 +8746,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.templates_external_wiki_active`
@@ -8974,8 +8974,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.templates_mock_monitoring_active`
@@ -8993,8 +8993,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.templates_packagist_active`
@@ -9240,8 +9240,8 @@ Count of Terraform MR reports generated
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.terraform_states`
@@ -9259,8 +9259,8 @@ Count of GitLab Managed Terraform States used
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.todos`
@@ -9373,8 +9373,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.web_ide_commits`
@@ -9506,8 +9506,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.wiki_pages_delete`
@@ -9525,8 +9525,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.wiki_pages_update`
@@ -9544,8 +9544,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts.wiki_pages_view`
@@ -9563,8 +9563,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts_monthly.aggregated_metrics.compliance_features_track_unique_visits_union`
@@ -9582,8 +9582,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts_monthly.aggregated_metrics.i_testing_paid_monthly_active_user_total`
@@ -9601,8 +9601,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts_monthly.aggregated_metrics.incident_management_alerts_total_unique_counts`
@@ -9620,8 +9620,8 @@ Count of unique users per month to take an action on an alert
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts_monthly.aggregated_metrics.incident_management_incidents_total_unique_counts`
@@ -9639,8 +9639,8 @@ Count of unique users per month to take an action on an incident
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts_monthly.aggregated_metrics.product_analytics_test_metrics_intersection`
@@ -9658,8 +9658,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts_monthly.aggregated_metrics.product_analytics_test_metrics_union`
@@ -9677,8 +9677,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts_monthly.deployments`
@@ -9716,8 +9716,8 @@ Total failed deployments
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts_monthly.packages`
@@ -9736,7 +9736,7 @@ Monthly count of Packages
 | `time_frame` | 28d |
 | `data_source` | Database |
 | `distribution` | ce |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts_monthly.personal_snippets`
@@ -9792,8 +9792,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts_monthly.snippets`
@@ -9830,8 +9830,8 @@ Total successful deployments
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` | Database |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `counts_weekly.aggregated_metrics.compliance_features_track_unique_visits_union`
@@ -9981,8 +9981,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `database.version`
@@ -10000,8 +10000,8 @@ The version of the PostgreSQL database.
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `dependency_proxy_enabled`
@@ -10019,8 +10019,8 @@ Whether dependency proxy is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `edition`
@@ -10057,8 +10057,8 @@ Whether Elasticsearch is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `geo_enabled`
@@ -10095,8 +10095,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `gitaly.clusters`
@@ -10114,8 +10114,8 @@ Total GitLab Managed clusters both enabled and disabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `gitaly.filesystems`
@@ -10133,8 +10133,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `gitaly.servers`
@@ -10152,8 +10152,8 @@ Total Gitalty Servers
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `gitaly.version`
@@ -10171,8 +10171,8 @@ Version of Gitaly
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `gitlab_pages.enabled`
@@ -10190,8 +10190,8 @@ Whether GitLab Pages is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `gitlab_pages.version`
@@ -10209,8 +10209,8 @@ The version number of GitLab Pages
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `gitlab_shared_runners_enabled`
@@ -10228,8 +10228,8 @@ Whether shared runners is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `gitpod_enabled`
@@ -10266,8 +10266,8 @@ Whether Grafana is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `gravatar_enabled`
@@ -10285,8 +10285,8 @@ Whether gravatar is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `historical_max_users`
@@ -10380,8 +10380,8 @@ Whether auto DevOps is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `ldap_enabled`
@@ -10399,8 +10399,8 @@ Whether LDAP is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `license_expires_at`
@@ -10551,8 +10551,8 @@ Date the license ends on
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `license_user_count`
@@ -10665,8 +10665,8 @@ Whether Mattermost is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `object_store.artifacts.enabled`
@@ -11159,8 +11159,8 @@ Whether OmniAuth is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `prometheus_enabled`
@@ -11178,8 +11178,8 @@ Whether the bundled Prometheus is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `prometheus_metrics_enabled`
@@ -11197,8 +11197,8 @@ Whether Prometheus Metrics endpoint is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `recorded_at`
@@ -11237,7 +11237,7 @@ When the core features were computed
 | `time_frame` | none |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `recording_ee_finished_at`
@@ -11273,9 +11273,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.analytics_total_unique_counts_weekly`
@@ -11292,7 +11292,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11311,9 +11311,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.g_analytics_contribution_weekly`
@@ -11330,7 +11330,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11349,9 +11349,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.g_analytics_insights_weekly`
@@ -11368,7 +11368,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11387,9 +11387,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.g_analytics_issues_weekly`
@@ -11406,7 +11406,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11425,9 +11425,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.g_analytics_merge_request_weekly`
@@ -11444,7 +11444,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11463,9 +11463,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.g_analytics_productivity_weekly`
@@ -11482,7 +11482,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11501,9 +11501,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.g_analytics_valuestream_weekly`
@@ -11520,7 +11520,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11539,9 +11539,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.i_analytics_cohorts_weekly`
@@ -11558,7 +11558,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11577,9 +11577,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.i_analytics_dev_ops_score_weekly`
@@ -11596,7 +11596,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11615,9 +11615,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.i_analytics_instance_statistics_weekly`
@@ -11634,7 +11634,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11653,9 +11653,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.p_analytics_code_reviews_weekly`
@@ -11672,7 +11672,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11691,9 +11691,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.p_analytics_insights_weekly`
@@ -11710,7 +11710,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11729,9 +11729,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.p_analytics_issues_weekly`
@@ -11748,7 +11748,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11767,9 +11767,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.p_analytics_merge_request_weekly`
@@ -11786,7 +11786,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11805,9 +11805,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.p_analytics_pipelines_weekly`
@@ -11824,7 +11824,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11843,9 +11843,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.p_analytics_repo_weekly`
@@ -11862,7 +11862,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11881,9 +11881,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.analytics.p_analytics_valuestream_weekly`
@@ -11900,7 +11900,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11919,9 +11919,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_secrets_management.i_ci_secrets_management_vault_build_created_weekly`
@@ -11938,7 +11938,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11957,9 +11957,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.ci_templates_total_unique_counts_weekly`
@@ -11976,7 +11976,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -11995,9 +11995,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_weekly`
@@ -12014,7 +12014,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12033,9 +12033,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_auto_devops_build_weekly`
@@ -12052,7 +12052,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12071,9 +12071,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_latest_weekly`
@@ -12090,7 +12090,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12109,9 +12109,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_weekly`
@@ -12128,7 +12128,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12147,9 +12147,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_auto_devops_weekly`
@@ -12166,7 +12166,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12185,9 +12185,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_aws_cf_deploy_ec2_weekly`
@@ -12204,7 +12204,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12223,9 +12223,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_aws_deploy_ecs_weekly`
@@ -12242,7 +12242,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12261,9 +12261,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_build_weekly`
@@ -12280,7 +12280,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12299,9 +12299,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_deploy_weekly`
@@ -12318,7 +12318,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12337,9 +12337,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_weekly`
@@ -12356,7 +12356,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12375,9 +12375,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_implicit_security_sast_weekly`
@@ -12394,7 +12394,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12413,9 +12413,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_implicit_security_secret_detection_weekly`
@@ -12432,7 +12432,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12451,9 +12451,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_security_sast_weekly`
@@ -12470,7 +12470,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12489,9 +12489,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_security_secret_detection_weekly`
@@ -12508,7 +12508,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12527,9 +12527,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ci_templates.p_ci_templates_terraform_base_latest_weekly`
@@ -12546,7 +12546,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12565,9 +12565,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.code_review_total_unique_counts_weekly`
@@ -12584,7 +12584,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12603,9 +12603,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_edit_mr_desc_weekly`
@@ -12622,7 +12622,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12641,9 +12641,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_edit_mr_title_weekly`
@@ -12660,7 +12660,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12679,9 +12679,9 @@ Count of unique merge requests per week|month with diffs viewed
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_mr_diffs_weekly`
@@ -12698,7 +12698,7 @@ Count of unique merge requests per week|month with diffs viewed
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12717,9 +12717,9 @@ Count of unique merge requests per week|month with diffs viewed file by file
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_mr_single_file_diffs_weekly`
@@ -12736,7 +12736,7 @@ Count of unique merge requests per week|month with diffs viewed file by file
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12755,9 +12755,9 @@ Count of unique users per month who added a suggestion
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_add_suggestion_weekly`
@@ -12774,7 +12774,7 @@ Count of unique users per week who added a suggestion
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12793,9 +12793,9 @@ Count of unique users per month who applied a suggestion
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_apply_suggestion_weekly`
@@ -12812,7 +12812,7 @@ Count of unique users per week who applied a suggestion
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12831,9 +12831,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_approval_rule_added_weekly`
@@ -12850,7 +12850,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12869,9 +12869,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_approval_rule_deleted_weekly`
@@ -12888,7 +12888,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12907,9 +12907,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_approval_rule_edited_weekly`
@@ -12926,7 +12926,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12945,9 +12945,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_approve_mr_weekly`
@@ -12964,7 +12964,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -12983,9 +12983,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_assigned_weekly`
@@ -13002,7 +13002,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13021,9 +13021,9 @@ Count of unique users per week|month who closed a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_close_mr_weekly`
@@ -13040,7 +13040,7 @@ Count of unique users per week|month who closed a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13059,9 +13059,9 @@ Count of unique users per week|month who commented on a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_create_mr_comment_weekly`
@@ -13078,7 +13078,7 @@ Count of unique users per week|month who commented on a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13097,9 +13097,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_create_mr_from_issue_weekly`
@@ -13116,7 +13116,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13135,9 +13135,9 @@ Count of unique users per week|month who created a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_create_mr_weekly`
@@ -13154,7 +13154,7 @@ Count of unique users per week|month who created a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13173,9 +13173,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_create_multiline_mr_comment_weekly`
@@ -13192,7 +13192,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13211,9 +13211,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_create_review_note_weekly`
@@ -13230,7 +13230,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13249,9 +13249,9 @@ Count of unique users per week|month who edited a comment on a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_edit_mr_comment_weekly`
@@ -13268,7 +13268,7 @@ Count of unique users per week|month who edited a comment on a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13287,9 +13287,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_edit_multiline_mr_comment_weekly`
@@ -13306,7 +13306,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13325,9 +13325,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_marked_as_draft_weekly`
@@ -13344,7 +13344,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13363,9 +13363,9 @@ Count of unique users per week|month who merged a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_merge_mr_weekly`
@@ -13382,7 +13382,7 @@ Count of unique users per week|month who merged a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13401,9 +13401,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_publish_review_weekly`
@@ -13420,7 +13420,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13439,9 +13439,9 @@ Count of unique users per week|month who removed a comment on a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_remove_mr_comment_weekly`
@@ -13458,7 +13458,7 @@ Count of unique users per week|month who removed a comment on a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13477,9 +13477,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_remove_multiline_mr_comment_weekly`
@@ -13496,7 +13496,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13515,9 +13515,9 @@ Count of unique users per week|month who reopened a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_reopen_mr_weekly`
@@ -13534,7 +13534,7 @@ Count of unique users per week|month who reopened a MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13553,9 +13553,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_resolve_thread_weekly`
@@ -13572,7 +13572,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13591,9 +13591,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_review_requested_weekly`
@@ -13610,7 +13610,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13629,9 +13629,9 @@ Count of unique users per week|month with diffs viewed file by file
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_single_file_diffs_weekly`
@@ -13648,7 +13648,7 @@ Count of unique users per week|month with diffs viewed file by file
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13667,9 +13667,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_toggled_task_item_status_weekly`
@@ -13686,7 +13686,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13705,9 +13705,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_unapprove_mr_weekly`
@@ -13724,7 +13724,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13743,9 +13743,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_unmarked_as_draft_weekly`
@@ -13762,7 +13762,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13781,9 +13781,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_unresolve_thread_weekly`
@@ -13800,7 +13800,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13819,9 +13819,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.code_review.i_code_review_user_vs_code_api_request_weekly`
@@ -13838,7 +13838,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13857,9 +13857,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.compliance.a_compliance_audit_events_api_weekly`
@@ -13876,7 +13876,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13895,9 +13895,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.compliance.compliance_total_unique_counts_weekly`
@@ -13914,7 +13914,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13933,9 +13933,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.compliance.g_compliance_audit_events_weekly`
@@ -13952,7 +13952,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -13971,9 +13971,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.compliance.g_compliance_dashboard_weekly`
@@ -13990,7 +13990,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14009,9 +14009,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.compliance.i_compliance_audit_events_weekly`
@@ -14028,7 +14028,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14047,9 +14047,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.compliance.i_compliance_credential_inventory_weekly`
@@ -14066,7 +14066,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14085,9 +14085,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.deploy_token_packages.deploy_token_packages_total_unique_counts_weekly`
@@ -14104,7 +14104,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14123,9 +14123,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.deploy_token_packages.i_package_composer_deploy_token_weekly`
@@ -14142,7 +14142,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14161,9 +14161,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.deploy_token_packages.i_package_conan_deploy_token_weekly`
@@ -14180,7 +14180,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14199,9 +14199,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.deploy_token_packages.i_package_container_deploy_token_weekly`
@@ -14218,7 +14218,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14237,9 +14237,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.deploy_token_packages.i_package_debian_deploy_token_weekly`
@@ -14256,7 +14256,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14275,9 +14275,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.deploy_token_packages.i_package_generic_deploy_token_weekly`
@@ -14294,7 +14294,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14313,9 +14313,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.deploy_token_packages.i_package_golang_deploy_token_weekly`
@@ -14332,7 +14332,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14351,9 +14351,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.deploy_token_packages.i_package_maven_deploy_token_weekly`
@@ -14370,7 +14370,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14389,9 +14389,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.deploy_token_packages.i_package_npm_deploy_token_weekly`
@@ -14408,7 +14408,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14427,9 +14427,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.deploy_token_packages.i_package_nuget_deploy_token_weekly`
@@ -14446,7 +14446,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14465,9 +14465,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.deploy_token_packages.i_package_pypi_deploy_token_weekly`
@@ -14484,7 +14484,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14503,9 +14503,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.deploy_token_packages.i_package_tag_deploy_token_weekly`
@@ -14522,7 +14522,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14541,9 +14541,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ecosystem.ecosystem_total_unique_counts_weekly`
@@ -14560,7 +14560,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14579,9 +14579,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ecosystem.i_ecosystem_jira_service_close_issue_weekly`
@@ -14598,7 +14598,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14617,9 +14617,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ecosystem.i_ecosystem_jira_service_create_issue_weekly`
@@ -14636,7 +14636,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14655,9 +14655,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ecosystem.i_ecosystem_jira_service_cross_reference_weekly`
@@ -14674,7 +14674,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14693,9 +14693,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ecosystem.i_ecosystem_jira_service_list_issues_weekly`
@@ -14712,7 +14712,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14731,9 +14731,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ide_edit.g_edit_by_sfe_weekly`
@@ -14750,7 +14750,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14769,9 +14769,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ide_edit.g_edit_by_snippet_ide_weekly`
@@ -14788,7 +14788,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14807,9 +14807,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ide_edit.g_edit_by_sse_weekly`
@@ -14826,7 +14826,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14845,9 +14845,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ide_edit.g_edit_by_web_ide_weekly`
@@ -14864,7 +14864,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14883,9 +14883,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.ide_edit.ide_edit_total_unique_counts_weekly`
@@ -14902,7 +14902,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14921,9 +14921,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_alert_assigned_weekly`
@@ -14940,7 +14940,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14959,9 +14959,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_alert_status_changed_weekly`
@@ -14978,7 +14978,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -14997,9 +14997,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_alert_todo_weekly`
@@ -15016,7 +15016,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15035,9 +15035,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_incident_assigned_weekly`
@@ -15054,7 +15054,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15073,9 +15073,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_incident_change_confidential_weekly`
@@ -15092,7 +15092,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15111,9 +15111,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_incident_closed_weekly`
@@ -15130,7 +15130,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15149,9 +15149,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_incident_comment_weekly`
@@ -15168,7 +15168,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15187,9 +15187,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_incident_created_weekly`
@@ -15206,7 +15206,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15225,9 +15225,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_incident_published_weekly`
@@ -15244,7 +15244,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15263,9 +15263,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_incident_relate_weekly`
@@ -15282,7 +15282,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15301,9 +15301,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_incident_reopened_weekly`
@@ -15320,7 +15320,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15339,9 +15339,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_incident_todo_weekly`
@@ -15358,7 +15358,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15377,9 +15377,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_incident_unrelate_weekly`
@@ -15396,7 +15396,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15415,7 +15415,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15434,7 +15434,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15453,9 +15453,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management.incident_management_total_unique_counts_weekly`
@@ -15472,7 +15472,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15491,9 +15491,9 @@ Count of unique users per month to create an incident corresponding to an alert
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.incident_management_alerts.incident_management_alert_create_incident_weekly`
@@ -15510,7 +15510,7 @@ Count of unique users per week to create an incident corresponding to an alert
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15529,9 +15529,9 @@ Count of MAU adding an issue to an epic
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_added_to_epic_weekly`
@@ -15548,7 +15548,7 @@ Count of WAU adding an issue to an epic
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15567,7 +15567,7 @@ Count of MAU changing issue assignees
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15586,7 +15586,7 @@ Count of WAU changing issue assignees
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15605,9 +15605,9 @@ Count of MAU changing the epic on an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_changed_epic_weekly`
@@ -15624,7 +15624,7 @@ Count of WAU changing the epic on an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15643,9 +15643,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_cloned_weekly`
@@ -15662,7 +15662,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15681,9 +15681,9 @@ Count of MAU closing an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_closed_weekly`
@@ -15700,7 +15700,7 @@ Count of WAU closing an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15719,9 +15719,9 @@ Count of MAU commenting on an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_comment_added_weekly`
@@ -15738,7 +15738,7 @@ Count of WAU commenting on an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15757,9 +15757,9 @@ Count of MAU editing a comment on an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_comment_edited_weekly`
@@ -15776,7 +15776,7 @@ Count of WAU editing a comment on an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15795,9 +15795,9 @@ Count of MAU deleting a comment from an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_comment_removed_weekly`
@@ -15814,7 +15814,7 @@ Count of WAU deleting a comment from an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15833,9 +15833,9 @@ Count of MAU creating new issues
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_created_weekly`
@@ -15852,7 +15852,7 @@ Count of WAU creating issues
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15871,9 +15871,9 @@ Count of MAU referencing an issue from somewhere else
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_cross_referenced_weekly`
@@ -15890,7 +15890,7 @@ Count of WAU referncing an issue from somewhere else
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15909,9 +15909,9 @@ Count of MAU editing an issue description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_description_changed_weekly`
@@ -15928,7 +15928,7 @@ Count of WAU editing an issue description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15947,9 +15947,9 @@ Count of MAU adding a design to an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_designs_added_weekly`
@@ -15966,7 +15966,7 @@ Count of WAU adding a design to an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -15985,9 +15985,9 @@ Count of MAU modifying a design on an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_designs_modified_weekly`
@@ -16004,7 +16004,7 @@ Count of WAU modifying a design on an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16023,9 +16023,9 @@ Count of MAU removing a design from an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_designs_removed_weekly`
@@ -16042,7 +16042,7 @@ Count of WAU removing a design from an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16061,9 +16061,9 @@ Count of MAU changing an issue due date
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_due_date_changed_weekly`
@@ -16080,7 +16080,7 @@ Count of WAU changing an issue due date
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16099,9 +16099,9 @@ Count of MAU changing the health status on an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_health_status_changed_weekly`
@@ -16118,7 +16118,7 @@ Count of WAU changing the health status on an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16137,9 +16137,9 @@ Count of MAU changing an issue's iteration
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_iteration_changed_weekly`
@@ -16156,7 +16156,7 @@ Count of WAU changing an issue's iteration
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16175,9 +16175,9 @@ Count of MAU changing an issue's label
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_label_changed_weekly`
@@ -16194,7 +16194,7 @@ Count of WAU changing an issue's label
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16213,9 +16213,9 @@ Count of MAU locking an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_locked_weekly`
@@ -16232,7 +16232,7 @@ Count of WAU locking an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16251,9 +16251,9 @@ Count of MAU making an issue confidential
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_made_confidential_weekly`
@@ -16270,7 +16270,7 @@ Count of WAU making an issue confidential
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16289,9 +16289,9 @@ Count of MAU making an issue not confidential
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_made_visible_weekly`
@@ -16308,7 +16308,7 @@ Count of WAU making an issue not confidential
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16327,9 +16327,9 @@ Count of MAU marking an issue as a duplicate
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_marked_as_duplicate_weekly`
@@ -16346,7 +16346,7 @@ Count of WAU marking an issue as a duplicate
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16365,9 +16365,9 @@ Count of MAU changing an issue's milestone
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_milestone_changed_weekly`
@@ -16384,7 +16384,7 @@ Count of WAU changing an issue's milestone
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16403,9 +16403,9 @@ Count of MAU moving an issue to another project
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_moved_weekly`
@@ -16422,7 +16422,7 @@ Count of WAU moving an issue to another project
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16441,9 +16441,9 @@ Count of MAU relating an issue to another issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_related_weekly`
@@ -16460,7 +16460,7 @@ Count of WAU relating an issue to another issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16479,9 +16479,9 @@ Count of MAU removing an issue from an epic
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_removed_from_epic_weekly`
@@ -16498,7 +16498,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16517,9 +16517,9 @@ Count of MAU re-opening a closed issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_reopened_weekly`
@@ -16536,7 +16536,7 @@ Count of WAU re-opening a closed issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16555,9 +16555,9 @@ Count of MAU changing an issue time estimate
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_time_estimate_changed_weekly`
@@ -16574,7 +16574,7 @@ Count of WAU changing an issue time estimate
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16593,9 +16593,9 @@ Count of MAU recording time spent on an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_time_spent_changed_weekly`
@@ -16612,7 +16612,7 @@ Count of WAU recording time spent on an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16631,9 +16631,9 @@ Count of MAU editing an issue title
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly`
@@ -16669,9 +16669,9 @@ Count of MAU marking an issue as blocked or blocked by
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_unlocked_weekly`
@@ -16688,7 +16688,7 @@ Count of WAU marking an issue as blocked or blocked by
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16707,9 +16707,9 @@ Count of MAU unrelating an issue to another issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_unrelated_weekly`
@@ -16726,7 +16726,7 @@ Count of WAU unrelating an issue to another issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16745,9 +16745,9 @@ Count of MAU changing an issue's weight
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.g_project_management_issue_weight_changed_weekly`
@@ -16764,7 +16764,7 @@ Count of WAU changing an issue's weight
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16783,9 +16783,9 @@ Count of MAU taking an action related to an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.issues_edit.issues_edit_total_unique_counts_weekly`
@@ -16802,7 +16802,7 @@ Count of WAU taking an action related to an issue
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16821,9 +16821,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly`
@@ -16840,7 +16840,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16859,9 +16859,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_approve_weekly`
@@ -16878,7 +16878,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16897,9 +16897,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_assign_multiple_weekly`
@@ -16916,7 +16916,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16935,9 +16935,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_assign_reviewer_weekly`
@@ -16954,7 +16954,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -16973,9 +16973,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_assign_self_weekly`
@@ -16992,7 +16992,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17011,9 +17011,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_assign_single_weekly`
@@ -17030,7 +17030,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17049,9 +17049,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_award_weekly`
@@ -17068,7 +17068,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17087,9 +17087,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_board_move_weekly`
@@ -17106,7 +17106,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17125,9 +17125,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_child_epic_weekly`
@@ -17144,7 +17144,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17163,9 +17163,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_clear_weight_weekly`
@@ -17182,7 +17182,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17201,9 +17201,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_clone_weekly`
@@ -17220,7 +17220,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17239,9 +17239,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_close_weekly`
@@ -17258,7 +17258,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17277,9 +17277,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_confidential_weekly`
@@ -17296,7 +17296,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17315,9 +17315,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_copy_metadata_issue_weekly`
@@ -17334,7 +17334,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17353,9 +17353,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_copy_metadata_merge_request_weekly`
@@ -17372,7 +17372,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17391,9 +17391,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_create_merge_request_weekly`
@@ -17410,7 +17410,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17429,9 +17429,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_done_weekly`
@@ -17448,7 +17448,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17467,9 +17467,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_draft_weekly`
@@ -17486,7 +17486,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17505,9 +17505,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_due_weekly`
@@ -17524,7 +17524,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17543,9 +17543,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_duplicate_weekly`
@@ -17562,7 +17562,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17581,9 +17581,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_epic_weekly`
@@ -17600,7 +17600,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17619,9 +17619,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_estimate_weekly`
@@ -17638,7 +17638,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17657,9 +17657,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_iteration_weekly`
@@ -17676,7 +17676,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17695,9 +17695,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_label_weekly`
@@ -17714,7 +17714,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17733,9 +17733,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_lock_weekly`
@@ -17752,7 +17752,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17771,9 +17771,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_merge_weekly`
@@ -17790,7 +17790,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17809,9 +17809,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_milestone_weekly`
@@ -17828,7 +17828,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17847,9 +17847,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_move_weekly`
@@ -17866,7 +17866,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17885,9 +17885,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_parent_epic_weekly`
@@ -17904,7 +17904,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17923,9 +17923,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_promote_weekly`
@@ -17942,7 +17942,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17961,9 +17961,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_publish_weekly`
@@ -17980,7 +17980,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -17999,9 +17999,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_reassign_reviewer_monthly`
@@ -18018,9 +18018,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_reassign_reviewer_weekly`
@@ -18037,7 +18037,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18056,7 +18056,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18075,9 +18075,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_rebase_weekly`
@@ -18094,7 +18094,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18113,9 +18113,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_relabel_weekly`
@@ -18132,7 +18132,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18151,9 +18151,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_relate_weekly`
@@ -18170,7 +18170,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18189,9 +18189,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_remove_child_epic_weekly`
@@ -18208,7 +18208,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18227,9 +18227,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_remove_due_date_weekly`
@@ -18246,7 +18246,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18265,9 +18265,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_remove_epic_weekly`
@@ -18284,7 +18284,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18303,9 +18303,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_remove_estimate_weekly`
@@ -18322,7 +18322,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18341,9 +18341,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_remove_iteration_weekly`
@@ -18360,7 +18360,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18379,9 +18379,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_remove_milestone_weekly`
@@ -18398,7 +18398,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18417,9 +18417,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_remove_parent_epic_weekly`
@@ -18436,7 +18436,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18455,9 +18455,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_remove_time_spent_weekly`
@@ -18474,7 +18474,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18493,9 +18493,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_remove_zoom_weekly`
@@ -18512,7 +18512,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18531,9 +18531,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_reopen_weekly`
@@ -18550,7 +18550,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18569,9 +18569,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_shrug_weekly`
@@ -18588,7 +18588,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18607,9 +18607,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_spend_add_weekly`
@@ -18626,7 +18626,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18645,9 +18645,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_spend_subtract_weekly`
@@ -18664,7 +18664,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18683,9 +18683,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_submit_review_weekly`
@@ -18702,7 +18702,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18721,9 +18721,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_subscribe_weekly`
@@ -18740,7 +18740,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18759,9 +18759,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_tableflip_weekly`
@@ -18778,7 +18778,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18797,9 +18797,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_tag_weekly`
@@ -18816,7 +18816,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18835,9 +18835,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_target_branch_weekly`
@@ -18854,7 +18854,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18873,9 +18873,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_title_weekly`
@@ -18892,7 +18892,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18911,9 +18911,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_todo_weekly`
@@ -18930,7 +18930,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18949,9 +18949,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_unassign_all_weekly`
@@ -18968,7 +18968,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -18987,9 +18987,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_unassign_reviewer_weekly`
@@ -19006,7 +19006,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19025,9 +19025,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_unassign_specific_weekly`
@@ -19044,7 +19044,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19063,9 +19063,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_unlabel_all_weekly`
@@ -19082,7 +19082,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19101,9 +19101,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_unlabel_specific_weekly`
@@ -19120,7 +19120,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19139,9 +19139,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_unlock_weekly`
@@ -19158,7 +19158,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19177,9 +19177,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_unsubscribe_weekly`
@@ -19196,7 +19196,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19215,9 +19215,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_weight_weekly`
@@ -19234,7 +19234,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19253,9 +19253,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_wip_weekly`
@@ -19272,7 +19272,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19291,9 +19291,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.i_quickactions_zoom_weekly`
@@ -19310,7 +19310,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19329,9 +19329,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.quickactions.quickactions_total_unique_counts_weekly`
@@ -19348,7 +19348,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19367,7 +19367,7 @@ Caluated unique users to visit Global Search with AGS enabled by month
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -19386,7 +19386,7 @@ Caluated unique users to visit Global Search with AGS enabled by week
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -19405,9 +19405,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.search.i_search_paid_weekly`
@@ -19424,7 +19424,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19443,7 +19443,7 @@ Caluated unique users to visit Global Search by month
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ce, ee |
 | `tier` | free, premium, ultimate |
 | `skip_validation` | true |
@@ -19462,7 +19462,7 @@ Caluated unique users to visit Global Search by week
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee, ce |
 | `tier` | free, premium, ultimate |
 | `skip_validation` | true |
@@ -19481,7 +19481,7 @@ Caluated unique users to visit Global Search by month
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ce, ee |
 | `tier` | free, premium, ultimate |
 | `skip_validation` | true |
@@ -19500,7 +19500,7 @@ Caluated unique users to visit Global Search by week
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee, ce |
 | `tier` | free, premium, ultimate |
 | `skip_validation` | true |
@@ -19519,9 +19519,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.snippets.i_snippets_show_weekly`
@@ -19538,7 +19538,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19557,9 +19557,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.source_code.design_action_weekly`
@@ -19576,7 +19576,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19595,9 +19595,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.source_code.git_write_action_weekly`
@@ -19614,7 +19614,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19633,9 +19633,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.source_code.i_source_code_code_intelligence_weekly`
@@ -19652,7 +19652,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19671,9 +19671,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.source_code.merge_request_action_weekly`
@@ -19690,7 +19690,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19709,9 +19709,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.source_code.project_action_weekly`
@@ -19728,7 +19728,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19747,9 +19747,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.source_code.wiki_action_weekly`
@@ -19766,7 +19766,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19785,9 +19785,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.terraform.p_terraform_state_api_unique_users_weekly`
@@ -19804,7 +19804,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19823,7 +19823,7 @@ Count of unique users per week|month who visit the full code quality report
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -19842,7 +19842,7 @@ Count of unique users per week|month who visit the full code quality report
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -19861,7 +19861,7 @@ Count of unique users per week|month who click on a project link in the group co
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -19880,7 +19880,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -19899,7 +19899,7 @@ Count of unique users per week|month who visited the group code coverage page
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -19918,7 +19918,7 @@ Count of unique users per week|month who visited the group code coverage page
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -19937,7 +19937,7 @@ Count of unique users per week|month who expanded the load performance report MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -19956,7 +19956,7 @@ Count of unique users per week|month who expanded the load performance report MR
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -19975,7 +19975,7 @@ Internal Tracking to count number of unit tests parsed for planning of future co
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ce, ee |
 | `tier` | free, premium, ultimate |
 | `skip_validation` | true |
@@ -19994,7 +19994,7 @@ Internal Tracking to count number of unit tests parsed for planning of future co
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee, ce |
 | `tier` | free, premium, ultimate |
 | `skip_validation` | true |
@@ -20013,7 +20013,7 @@ Count of unique users per week|month who expanded the metrics report MR widget
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -20032,7 +20032,7 @@ Count of unique users per week|month who expanded the metrics report MR widget
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -20051,7 +20051,7 @@ Internal Tracking to count number of unit tests parsed for planning of future co
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ce, ee |
 | `tier` | free, premium, ultimate |
 | `skip_validation` | true |
@@ -20070,7 +20070,7 @@ Internal Tracking to count number of unit tests parsed for planning of future co
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee, ce |
 | `tier` | free, premium, ultimate |
 | `skip_validation` | true |
@@ -20089,7 +20089,7 @@ Count of unique users per week|month who expanded the browser performance report
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -20108,7 +20108,7 @@ Count of unique users per week|month who expanded the browser performance report
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` | premium, ultimate |
 | `skip_validation` | true |
@@ -20127,9 +20127,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.testing.testing_total_unique_counts_weekly`
@@ -20146,7 +20146,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20165,9 +20165,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.user_packages.i_package_composer_user_weekly`
@@ -20184,7 +20184,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20203,9 +20203,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.user_packages.i_package_conan_user_weekly`
@@ -20222,7 +20222,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20241,9 +20241,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.user_packages.i_package_container_user_weekly`
@@ -20260,7 +20260,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20279,9 +20279,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.user_packages.i_package_debian_user_weekly`
@@ -20298,7 +20298,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20317,9 +20317,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.user_packages.i_package_generic_user_weekly`
@@ -20336,7 +20336,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20355,9 +20355,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.user_packages.i_package_golang_user_weekly`
@@ -20374,7 +20374,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20393,9 +20393,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.user_packages.i_package_maven_user_weekly`
@@ -20412,7 +20412,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20431,9 +20431,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.user_packages.i_package_npm_user_weekly`
@@ -20450,7 +20450,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20469,9 +20469,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.user_packages.i_package_nuget_user_weekly`
@@ -20488,7 +20488,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20507,9 +20507,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.user_packages.i_package_pypi_user_weekly`
@@ -20526,7 +20526,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20545,9 +20545,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.user_packages.i_package_tag_user_weekly`
@@ -20564,7 +20564,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20583,9 +20583,9 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 28d |
-| `data_source` | Redis |
-| `distribution` |  |
-| `tier` |  |
+| `data_source` | Redis_hll |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `redis_hll_counters.user_packages.user_packages_total_unique_counts_weekly`
@@ -20602,7 +20602,7 @@ Missing description
 | `value_type` | number |
 | `status` | data_available |
 | `time_frame` | 7d |
-| `data_source` | Redis |
+| `data_source` | Redis_hll |
 | `distribution` | ee |
 | `tier` |  |
 | `skip_validation` | true |
@@ -20622,8 +20622,8 @@ Whether incoming email is setup
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `search_unique_visits.i_search_advanced`
@@ -20698,8 +20698,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `search_unique_visits.search_unique_visits_for_any_target_weekly`
@@ -20755,8 +20755,8 @@ Whether public signup is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `topology.duration_s`
@@ -21192,8 +21192,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.approval_project_rules_with_less_approvers_than_required`
@@ -21211,8 +21211,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.approval_project_rules_with_more_approvers_than_required`
@@ -21230,8 +21230,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.approval_project_rules_with_target_branch`
@@ -21268,8 +21268,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.keys`
@@ -21287,8 +21287,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.merge_requests`
@@ -21306,8 +21306,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.merge_requests_with_added_rules`
@@ -21363,8 +21363,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.merge_requests_with_required_codeowners`
@@ -21401,8 +21401,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.projects_imported_from_github`
@@ -21420,8 +21420,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.projects_with_disable_overriding_approvers_per_merge_request`
@@ -21440,7 +21440,7 @@ Missing description
 | `time_frame` | all |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.projects_with_repositories_enabled`
@@ -21458,8 +21458,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.projects_with_sectional_code_owner_rules`
@@ -21477,8 +21477,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.projects_without_disable_overriding_approvers_per_merge_request`
@@ -21497,7 +21497,7 @@ Missing description
 | `time_frame` | all |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.protected_branches`
@@ -21515,8 +21515,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.remote_mirrors`
@@ -21534,8 +21534,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.snippets`
@@ -21572,8 +21572,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.total_number_of_locked_files`
@@ -21591,8 +21591,8 @@ The total number of exclusive file locks (through the CLI)
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.total_number_of_path_locks`
@@ -21610,8 +21610,8 @@ The total number of default branch locks done through the GitLab UI
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.users_using_lfs_locks`
@@ -21629,8 +21629,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.create.users_using_path_locks`
@@ -21648,8 +21648,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.bulk_imports.gitlab`
@@ -21667,8 +21667,8 @@ Distinct count of users that triggered an import using the Group Migration tool
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.bulk_imports.gitlab_v1`
@@ -21686,8 +21686,8 @@ Count of imports using GitLab Migration
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.events`
@@ -21706,7 +21706,7 @@ Missing description
 | `time_frame` | all |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.group_imports.gitlab_migration`
@@ -21724,8 +21724,8 @@ Count of groups imported using GitLab Migration
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.group_imports.group_import`
@@ -21743,8 +21743,8 @@ Count of group imports using Group Import/Export
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.group_saml_enabled`
@@ -21781,8 +21781,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.groups_imported`
@@ -21800,8 +21800,8 @@ Distinct count of users that imported groups using Group Import
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.issue_imports.csv`
@@ -21819,8 +21819,8 @@ Count of (attempted) imports from csv files
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.issue_imports.fogbugz`
@@ -21838,8 +21838,8 @@ Count of projects imported from fogbugz
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.issue_imports.jira`
@@ -21857,8 +21857,8 @@ Count of projects imported from Jira
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.issue_imports.phabricator`
@@ -21876,8 +21876,8 @@ Count of projects imported from phabricator
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.issues_imported.csv`
@@ -21895,8 +21895,8 @@ Distinct count of users that imported issues into projects using CSV upload
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.issues_imported.fogbugz`
@@ -21914,8 +21914,8 @@ Distinct count of users that imported issues into projects using FogBugz
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.issues_imported.jira`
@@ -21933,8 +21933,8 @@ Distinct count of users that imported issues into projects using Jira
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.issues_imported.phabricator`
@@ -21952,8 +21952,8 @@ Distinct count of users that imported issues into projects using Phabricator
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.ldap_admin_sync_enabled`
@@ -22009,8 +22009,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.ldap_servers`
@@ -22047,8 +22047,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.omniauth_providers`
@@ -22066,8 +22066,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.project_imports.bitbucket`
@@ -22085,8 +22085,8 @@ Count of projects imported from Bitbucket
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.project_imports.bitbucket_server`
@@ -22104,8 +22104,8 @@ Count of projects imported from Bitbucket Server
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.project_imports.git`
@@ -22123,8 +22123,8 @@ Count of projects imported by URL
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.project_imports.gitea`
@@ -22142,8 +22142,8 @@ Count of projects imported from Gitea
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.project_imports.github`
@@ -22161,8 +22161,8 @@ Count of projects imported from GitHub
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.project_imports.gitlab`
@@ -22180,8 +22180,8 @@ Count of projects imported from GitLab.com
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.project_imports.gitlab_migration`
@@ -22199,8 +22199,8 @@ Count of projects imported using GitLab Migration
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.project_imports.gitlab_project`
@@ -22218,8 +22218,8 @@ Count of projects imported using Project Import/Export
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.project_imports.manifest`
@@ -22237,8 +22237,8 @@ Count of projects imported using manifst file
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.projects_imported.bitbucket`
@@ -22256,8 +22256,8 @@ Distinct count of users that imported projects from Bitbucket Cloud
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.projects_imported.bitbucket_server`
@@ -22275,8 +22275,8 @@ Distinct count of users that imported projects from Bitbucket Server
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.projects_imported.git`
@@ -22294,8 +22294,8 @@ Distinct count of users that imported projects using Import by URL
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.projects_imported.gitea`
@@ -22313,8 +22313,8 @@ Distinct count of users that imported projects from Gitea
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.projects_imported.github`
@@ -22332,8 +22332,8 @@ Distinct count of users that imported projects from GitHub
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.projects_imported.gitlab`
@@ -22351,8 +22351,8 @@ Distinct count of users that imported projects from GitLab.com
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.projects_imported.gitlab_project`
@@ -22370,8 +22370,8 @@ Distinct count of users that imported projects using Project Import/Export
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.projects_imported.manifest`
@@ -22389,8 +22389,8 @@ Distinct count of users that imported projects using Manifest file
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.projects_imported.total`
@@ -22408,8 +22408,8 @@ Total count of all projects imported with import_source NOT NULL
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.projects_with_compliance_framework`
@@ -22446,8 +22446,8 @@ Distinct count of users that triggered any kind of import
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.user_auth_by_provider.google_oauth2`
@@ -22465,8 +22465,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.user_auth_by_provider.standard`
@@ -22484,8 +22484,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.user_auth_by_provider.two-factor`
@@ -22503,8 +22503,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.user_auth_by_provider.two-factor-via-u2f-device`
@@ -22522,8 +22522,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.user_auth_by_provider.two-factor-via-webauthn-device`
@@ -22541,8 +22541,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.users_created`
@@ -22560,8 +22560,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.manage.value_stream_management_customized_group_stages`
@@ -22598,8 +22598,8 @@ Total GitLab Managed clusters both enabled and disabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.monitor.clusters_applications_prometheus`
@@ -22617,8 +22617,8 @@ Total GitLab Managed clusters with Prometheus enabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.monitor.operations_dashboard_default_dashboard`
@@ -22636,8 +22636,8 @@ Active users with enabled operations dashboard
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.monitor.operations_dashboard_users_with_projects_added`
@@ -22655,8 +22655,8 @@ Active users with projects on operations dashboard
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.monitor.projects_incident_sla_enabled`
@@ -22674,8 +22674,8 @@ Projects where Incident SLA is enabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.monitor.projects_with_alert_incidents`
@@ -22693,8 +22693,8 @@ Count of unique projects with an incident from an alert
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.monitor.projects_with_error_tracking_enabled`
@@ -22712,8 +22712,8 @@ Projects where error tracking is enabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.monitor.projects_with_incidents`
@@ -22731,8 +22731,8 @@ Count of unique projects with an incident
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.monitor.projects_with_tracing_enabled`
@@ -22750,8 +22750,8 @@ Projects with tracing enabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.package.projects_with_packages`
@@ -22770,7 +22770,7 @@ Projects with package registry configured
 | `time_frame` | all |
 | `data_source` |  |
 | `distribution` | ce |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.plan.assignee_lists`
@@ -22807,8 +22807,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.plan.issues`
@@ -22826,8 +22826,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.plan.label_lists`
@@ -22845,8 +22845,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.plan.milestone_lists`
@@ -22864,8 +22864,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.plan.notes`
@@ -22883,8 +22883,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.plan.projects`
@@ -22902,8 +22902,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.plan.projects_jira_active`
@@ -22921,8 +22921,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.plan.projects_jira_dvcs_cloud_active`
@@ -22940,8 +22940,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.plan.projects_jira_dvcs_server_active`
@@ -22959,8 +22959,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.plan.service_desk_enabled_projects`
@@ -22979,7 +22979,7 @@ Missing description
 | `time_frame` | all |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.plan.service_desk_issues`
@@ -22998,7 +22998,7 @@ Missing description
 | `time_frame` | all |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.plan.todos`
@@ -23016,8 +23016,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.release.deployments`
@@ -23035,8 +23035,8 @@ Unique users triggering deployments
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.release.failed_deployments`
@@ -23054,8 +23054,8 @@ Total failed deployments
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.release.projects_mirrored_with_pipelines_enabled`
@@ -23073,8 +23073,8 @@ Projects with repository mirroring enabled
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.release.releases`
@@ -23092,8 +23092,8 @@ Unique users creating release tags
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.release.successful_deployments`
@@ -23111,8 +23111,8 @@ Total successful deployments
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.secure.api_fuzzing_scans`
@@ -23263,8 +23263,8 @@ Count of API Fuzzing `docker-in-docker` jobs by job name
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.secure.user_api_fuzzing_jobs`
@@ -23282,8 +23282,8 @@ Count of API Fuzzing jobs by job name
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.secure.user_container_scanning_jobs`
@@ -23320,8 +23320,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.secure.user_dast_jobs`
@@ -23339,8 +23339,8 @@ Count of DAST jobs
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.secure.user_dependency_scanning_jobs`
@@ -23453,8 +23453,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.verify.ci_builds`
@@ -23472,8 +23472,8 @@ Unique builds in project
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.verify.ci_external_pipelines`
@@ -23491,8 +23491,8 @@ Total pipelines in external repositories
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.verify.ci_internal_pipelines`
@@ -23510,8 +23510,8 @@ Total pipelines in GitLab repositories
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.verify.ci_pipeline_config_auto_devops`
@@ -23529,8 +23529,8 @@ Total pipelines from an Auto DevOps template
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.verify.ci_pipeline_config_repository`
@@ -23548,8 +23548,8 @@ Total Pipelines from templates in repository
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.verify.ci_pipeline_schedules`
@@ -23567,8 +23567,8 @@ Pipeline schedules in GitLab
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.verify.ci_pipelines`
@@ -23587,7 +23587,7 @@ Distinct Users triggering Total pipelines
 | `time_frame` | all |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.verify.ci_triggers`
@@ -23605,8 +23605,8 @@ Total configured Triggers in project
 | `status` | data_available |
 | `time_frame` | all |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage.verify.clusters_applications_runner`
@@ -24004,8 +24004,8 @@ Projects with Prometheus alerting enabled
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.action_monthly_active_users_design_management`
@@ -24023,8 +24023,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.action_monthly_active_users_git_write`
@@ -24042,8 +24042,8 @@ Aggregated value for wiki, design and project repo actions
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.action_monthly_active_users_ide_edit`
@@ -24061,8 +24061,8 @@ Count unique edit actions when users used an IDE, no matter which one
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.action_monthly_active_users_project_repo`
@@ -24080,8 +24080,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.action_monthly_active_users_sfe_edit`
@@ -24099,8 +24099,8 @@ Count unique edit actions using the single file editor
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.action_monthly_active_users_snippet_editor_edit`
@@ -24118,8 +24118,8 @@ Count unique edit actions using the snippet editor
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.action_monthly_active_users_sse_edit`
@@ -24137,8 +24137,8 @@ Count unique edit actions using the static site editor
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.action_monthly_active_users_web_ide_edit`
@@ -24156,8 +24156,8 @@ Count unique edit actions using the web IDE
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.action_monthly_active_users_wiki_repo`
@@ -24175,8 +24175,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.approval_project_rules`
@@ -24213,8 +24213,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.approval_project_rules_with_less_approvers_than_required`
@@ -24232,8 +24232,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.approval_project_rules_with_more_approvers_than_required`
@@ -24251,8 +24251,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.approval_project_rules_with_target_branch`
@@ -24289,8 +24289,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.keys`
@@ -24308,8 +24308,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.merge_requests`
@@ -24327,8 +24327,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.merge_requests_users`
@@ -24346,8 +24346,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.merge_requests_with_added_rules`
@@ -24441,8 +24441,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.projects_imported_from_github`
@@ -24460,8 +24460,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.projects_with_disable_overriding_approvers_per_merge_request`
@@ -24480,7 +24480,7 @@ Missing description
 | `time_frame` | 28d |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.projects_with_repositories_enabled`
@@ -24498,8 +24498,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.projects_with_sectional_code_owner_rules`
@@ -24517,8 +24517,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.projects_without_disable_overriding_approvers_per_merge_request`
@@ -24537,7 +24537,7 @@ Missing description
 | `time_frame` | 28d |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.protected_branches`
@@ -24555,8 +24555,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.remote_mirrors`
@@ -24574,8 +24574,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.snippets`
@@ -24612,8 +24612,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.total_number_of_locked_files`
@@ -24631,8 +24631,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.total_number_of_path_locks`
@@ -24650,8 +24650,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.create.users_using_lfs_locks`
@@ -24707,8 +24707,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.bulk_imports.gitlab_v1`
@@ -24726,8 +24726,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.events`
@@ -24746,7 +24746,7 @@ Missing description
 | `time_frame` | 28d |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.group_imports.gitlab_migration`
@@ -24764,8 +24764,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.group_imports.group_import`
@@ -24783,8 +24783,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.group_saml_enabled`
@@ -24821,8 +24821,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.groups_imported`
@@ -24840,8 +24840,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.issue_imports.csv`
@@ -24859,8 +24859,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.issue_imports.fogbugz`
@@ -24878,8 +24878,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.issue_imports.jira`
@@ -24897,8 +24897,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.issue_imports.phabricator`
@@ -24916,8 +24916,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.issues_imported.csv`
@@ -24935,8 +24935,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.issues_imported.fogbugz`
@@ -24954,8 +24954,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.issues_imported.jira`
@@ -24973,8 +24973,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.issues_imported.phabricator`
@@ -24992,8 +24992,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.ldap_admin_sync_enabled`
@@ -25049,8 +25049,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.ldap_servers`
@@ -25087,8 +25087,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.omniauth_providers`
@@ -25106,8 +25106,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.project_imports.bitbucket`
@@ -25125,8 +25125,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.project_imports.bitbucket_server`
@@ -25144,8 +25144,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.project_imports.git`
@@ -25163,8 +25163,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.project_imports.gitea`
@@ -25182,8 +25182,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.project_imports.github`
@@ -25201,8 +25201,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.project_imports.gitlab`
@@ -25220,8 +25220,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.project_imports.gitlab_migration`
@@ -25239,8 +25239,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.project_imports.gitlab_project`
@@ -25258,8 +25258,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.project_imports.manifest`
@@ -25277,8 +25277,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.projects_imported.bitbucket`
@@ -25296,8 +25296,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.projects_imported.bitbucket_server`
@@ -25315,8 +25315,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.projects_imported.git`
@@ -25334,8 +25334,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.projects_imported.gitea`
@@ -25353,8 +25353,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.projects_imported.github`
@@ -25372,8 +25372,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.projects_imported.gitlab`
@@ -25391,8 +25391,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.projects_imported.gitlab_project`
@@ -25410,8 +25410,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.projects_imported.manifest`
@@ -25429,8 +25429,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.projects_imported.total`
@@ -25448,8 +25448,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.projects_with_compliance_framework`
@@ -25486,8 +25486,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.user_auth_by_provider.google_oauth2`
@@ -25505,8 +25505,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.user_auth_by_provider.standard`
@@ -25524,8 +25524,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor`
@@ -25543,8 +25543,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor-via-u2f-device`
@@ -25562,8 +25562,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor-via-webauthn-device`
@@ -25581,8 +25581,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.users_created`
@@ -25601,7 +25601,7 @@ Number of users created in the month
 | `time_frame` | 28d |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.manage.value_stream_management_customized_group_stages`
@@ -25638,8 +25638,8 @@ Total GitLab Managed clusters both enabled and disabled
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.monitor.clusters_applications_prometheus`
@@ -25657,8 +25657,8 @@ Total GitLab Managed clusters with Prometheus enabled
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.monitor.operations_dashboard_default_dashboard`
@@ -25676,8 +25676,8 @@ Active users with enabled operations dashboard
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.monitor.operations_dashboard_users_with_projects_added`
@@ -25695,8 +25695,8 @@ Active users with projects on operations dashboard
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.monitor.projects_incident_sla_enabled`
@@ -25714,8 +25714,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.monitor.projects_with_alert_incidents`
@@ -25733,8 +25733,8 @@ Count of unique projects with an incident from an alert created in the last mont
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.monitor.projects_with_error_tracking_enabled`
@@ -25752,8 +25752,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.monitor.projects_with_incidents`
@@ -25771,8 +25771,8 @@ Count of unique projects with an incident created in the last month
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.monitor.projects_with_tracing_enabled`
@@ -25790,8 +25790,8 @@ Projects with tracing enabled
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.package.projects_with_packages`
@@ -25810,7 +25810,7 @@ Incident confidential status changed event
 | `time_frame` | 28d |
 | `data_source` |  |
 | `distribution` | ce |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.plan.assignee_lists`
@@ -25847,8 +25847,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.plan.issues`
@@ -25867,7 +25867,7 @@ Missing description
 | `time_frame` | 28d |
 | `data_source` |  |
 | `distribution` | ce |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.plan.label_lists`
@@ -25885,8 +25885,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.plan.milestone_lists`
@@ -25904,8 +25904,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.plan.notes`
@@ -25923,8 +25923,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.plan.projects`
@@ -25942,8 +25942,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.plan.projects_jira_active`
@@ -25961,8 +25961,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.plan.projects_jira_dvcs_cloud_active`
@@ -25980,8 +25980,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.plan.projects_jira_dvcs_server_active`
@@ -25999,8 +25999,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.plan.service_desk_enabled_projects`
@@ -26019,7 +26019,7 @@ Missing description
 | `time_frame` | 28d |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.plan.service_desk_issues`
@@ -26038,7 +26038,7 @@ Missing description
 | `time_frame` | 28d |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.plan.todos`
@@ -26056,8 +26056,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.release.deployments`
@@ -26075,8 +26075,8 @@ Unique users triggering deployments
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.release.failed_deployments`
@@ -26094,8 +26094,8 @@ Total failed deployments
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.release.projects_mirrored_with_pipelines_enabled`
@@ -26113,8 +26113,8 @@ Projects with repository mirroring enabled
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.release.releases`
@@ -26132,8 +26132,8 @@ Unique users creating release tags
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.release.successful_deployments`
@@ -26151,8 +26151,8 @@ Total successful deployments
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.secure.api_fuzzing_pipeline`
@@ -26189,8 +26189,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.secure.container_scanning_pipeline`
@@ -26227,8 +26227,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.secure.coverage_fuzzing_pipeline`
@@ -26265,8 +26265,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.secure.dast_pipeline`
@@ -26284,7 +26284,7 @@ Count of pipelines that have at least 1 DAST job
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
+| `distribution` | ce |
 | `tier` | ultimate |
 | `skip_validation` | true |
 
@@ -26303,8 +26303,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.secure.dependency_scanning_pipeline`
@@ -26341,8 +26341,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.secure.sast_pipeline`
@@ -26379,8 +26379,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.secure.secret_detection_pipeline`
@@ -26417,8 +26417,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.secure.user_api_fuzzing_dnd_jobs`
@@ -26436,8 +26436,8 @@ Count of API Fuzzing `docker-in-docker` jobs by job names
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.secure.user_api_fuzzing_jobs`
@@ -26455,8 +26455,8 @@ Count of API Fuzzing jobs by job name
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.secure.user_container_scanning_jobs`
@@ -26493,8 +26493,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.secure.user_dast_jobs`
@@ -26512,8 +26512,8 @@ Users who run a DAST job
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.secure.user_dependency_scanning_jobs`
@@ -26626,8 +26626,8 @@ Missing description
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.verify.ci_builds`
@@ -26645,8 +26645,8 @@ Unique builds in project
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.verify.ci_external_pipelines`
@@ -26664,8 +26664,8 @@ Total pipelines in external repositories
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.verify.ci_internal_pipelines`
@@ -26683,8 +26683,8 @@ Total pipelines in GitLab repositories
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.verify.ci_pipeline_config_auto_devops`
@@ -26702,8 +26702,8 @@ Total pipelines from an Auto DevOps template
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.verify.ci_pipeline_config_repository`
@@ -26721,8 +26721,8 @@ Total Pipelines from templates in repository
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.verify.ci_pipeline_schedules`
@@ -26740,8 +26740,8 @@ Pipeline schedules in GitLab
 | `status` | data_available |
 | `time_frame` | 28d |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.verify.ci_pipelines`
@@ -26760,7 +26760,7 @@ Pipeline schedules in GitLab
 | `time_frame` | 28d |
 | `data_source` |  |
 | `distribution` | ce, ee |
-| `tier` |  |
+| `tier` | free |
 | `skip_validation` | true |
 
 ## `usage_activity_by_stage_monthly.verify.ci_triggers`
@@ -26874,6 +26874,6 @@ Whether web ide clientside preview is enabled
 | `status` | data_available |
 | `time_frame` | none |
 | `data_source` |  |
-| `distribution` |  |
-| `tier` |  |
+| `distribution` | ce |
+| `tier` | free |
 | `skip_validation` | true |
diff --git a/doc/development/usage_ping/metrics_dictionary.md b/doc/development/usage_ping/metrics_dictionary.md
index 406a223b204..db40ce0af27 100644
--- a/doc/development/usage_ping/metrics_dictionary.md
+++ b/doc/development/usage_ping/metrics_dictionary.md
@@ -50,18 +50,19 @@ instance unique identifier.
 ```yaml
 key_path: uuid
 description: GitLab instance unique identifier
-value_type: string
 product_category: collection
+product_section: growth
 product_stage: growth
+product_group: group::product intelligence
+value_type: string
 status: data_available
 milestone: 9.1
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
-product_group: group::product intelligence
 time_frame: none
 data_source: database
 distribution:
-- ee
 - ce
+- ee
 tier:
 - free
 - premium
diff --git a/spec/graphql/types/label_type_spec.rb b/spec/graphql/types/label_type_spec.rb
index 6a999a2e925..427b5d2dcef 100644
--- a/spec/graphql/types/label_type_spec.rb
+++ b/spec/graphql/types/label_type_spec.rb
@@ -3,7 +3,16 @@ require 'spec_helper'
 
 RSpec.describe GitlabSchema.types['Label'] do
   it 'has the correct fields' do
-    expected_fields = [:id, :description, :description_html, :title, :color, :text_color]
+    expected_fields = [
+      :id,
+      :description,
+      :description_html,
+      :title,
+      :color,
+      :text_color,
+      :created_at,
+      :updated_at
+    ]
 
     expect(described_class).to have_graphql_fields(*expected_fields)
   end
diff --git a/spec/models/snippet_repository_spec.rb b/spec/models/snippet_repository_spec.rb
index cdbc1feefce..11196f06529 100644
--- a/spec/models/snippet_repository_spec.rb
+++ b/spec/models/snippet_repository_spec.rb
@@ -286,6 +286,7 @@ RSpec.describe SnippetRepository do
 
     context 'with git errors' do
       it_behaves_like 'snippet repository with git errors', 'invalid://path/here', described_class::InvalidPathError
+      it_behaves_like 'snippet repository with git errors', '.git/hooks/pre-commit', described_class::InvalidPathError
       it_behaves_like 'snippet repository with git errors', '../../path/traversal/here', described_class::InvalidPathError
       it_behaves_like 'snippet repository with git errors', 'README', described_class::CommitError