Add latest changes from gitlab-org/gitlab@master

14 files changed, 2 insertions, 465 deletions

diff --git a/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb b/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
index 7f6d67e01c7..97091ff975b 100644
--- a/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
@@ -2,7 +2,7 @@
 
 module Gitlab::UsageDataCounters
   class CiTemplateUniqueCounter
-    REDIS_SLOT = 'ci_templates'
+    PREFIX = 'ci_templates'
     KNOWN_EVENTS_FILE_PATH = File.expand_path('known_events/ci_templates.yml', __dir__)
 
     class << self
@@ -28,7 +28,7 @@ module Gitlab::UsageDataCounters
       def ci_template_event_name(template_name, config_source)
         prefix = 'implicit_' if config_source.to_s == 'auto_devops_source'
 
-        "p_#{REDIS_SLOT}_#{prefix}#{template_to_event_name(template_name)}"
+        "p_#{PREFIX}_#{prefix}#{template_to_event_name(template_name)}"
       end
 
       def expand_template_name(template_name)
diff --git a/lib/gitlab/usage_data_counters/known_events/analytics.yml b/lib/gitlab/usage_data_counters/known_events/analytics.yml
index 1c390f2d7fd..0b30308b552 100644
--- a/lib/gitlab/usage_data_counters/known_events/analytics.yml
+++ b/lib/gitlab/usage_data_counters/known_events/analytics.yml
@@ -1,39 +1,26 @@
 - name: users_viewing_analytics_group_devops_adoption
-  redis_slot: analytics
   aggregation: weekly
 - name: i_analytics_dev_ops_adoption
-  redis_slot: analytics
   aggregation: weekly
 - name: i_analytics_dev_ops_score
-  redis_slot: analytics
   aggregation: weekly
 - name: i_analytics_instance_statistics
-  redis_slot: analytics
   aggregation: weekly
 - name: p_analytics_pipelines
-  redis_slot: analytics
   aggregation: weekly
 - name: p_analytics_valuestream
-  redis_slot: analytics
   aggregation: weekly
 - name: p_analytics_repo
-  redis_slot: analytics
   aggregation: weekly
 - name: i_analytics_cohorts
-  redis_slot: analytics
   aggregation: weekly
 - name: p_analytics_ci_cd_pipelines
-  redis_slot: analytics
   aggregation: weekly
 - name: p_analytics_ci_cd_deployment_frequency
-  redis_slot: analytics
   aggregation: weekly
 - name: p_analytics_ci_cd_lead_time
-  redis_slot: analytics
   aggregation: weekly
 - name: p_analytics_ci_cd_time_to_restore_service
-  redis_slot: analytics
   aggregation: weekly
 - name: p_analytics_ci_cd_change_failure_rate
-  redis_slot: analytics
   aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
index e717679e3dc..82c023e6e38 100644
--- a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
@@ -4,455 +4,304 @@
 # Do not edit it manually!
 ---
 - name: p_ci_templates_terraform_base_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_terraform_base
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_dotnet
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_nodejs
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_openshift
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_auto_devops
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_bash
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_rust
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_elixir
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_clojure
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_crystal
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_getting_started
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_code_quality
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_verify_load_performance_testing
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_verify_accessibility
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_verify_failfast
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_verify_browser_performance
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_verify_browser_performance_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_grails
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_sast
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_dast_runner_validation
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_dast_on_demand_scan
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_secret_detection
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_license_scanning
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_coverage_fuzzing_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_dast_on_demand_api_scan
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_coverage_fuzzing
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_api_fuzzing_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_secure_binaries
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_dast_api
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_container_scanning
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_dast_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_sast_iac
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_dependency_scanning
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_dast_api_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_container_scanning_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_api_fuzzing
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_dast
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_api_discovery
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_fortify_fod_sast
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_security_sast_iac_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_qualys_iac_security
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_ios_fastlane
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_composer
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_c
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_python
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_android_fastlane
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_android_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_django
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_maven
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_liquibase
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_flutter
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_workflows_branch_pipelines
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_workflows_mergerequest_pipelines
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_laravel
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_kaniko
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_php
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_packer
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_themekit
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_terraform
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_katalon
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_mono
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_go
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_scala
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_latex
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_android
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_indeni_cloudrail
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_matlab
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_deploy_ecs
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_aws_cf_provision_and_deploy_ec2
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_aws_deploy_ecs
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_gradle
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_chef
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_dast_default_branch_deploy
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_load_performance_testing
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_helm_2to3
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_sast
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_secret_detection
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_license_scanning
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_code_intelligence
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_code_quality
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_deploy_ecs
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_deploy_ec2
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_license_scanning_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_deploy
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_build
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_browser_performance_testing
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_container_scanning
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_container_scanning_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_dependency_scanning_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_test
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_sast_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_sast_iac
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_secret_detection_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_dependency_scanning
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_deploy_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_browser_performance_testing_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_cf_provision
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_build_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_jobs_sast_iac_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_terraform_latest
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_swift
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_jekyll
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_harp
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_octopress
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_brunch
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_doxygen
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_hyde
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_lektor
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_jbake
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_hexo
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_middleman
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_hugo
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_pelican
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_nanoc
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_swaggerui
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_jigsaw
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_metalsmith
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_gatsby
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_pages_html
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_dart
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_docker
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_julia
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_npm
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_dotnet_core
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_5_minute_production_app
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_ruby
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_auto_devops
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_browser_performance_testing
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_build
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_code_intelligence
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_code_quality
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_container_scanning
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_dast_default_branch_deploy
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_dependency_scanning
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_deploy
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_deploy_ec2
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_deploy_ecs
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_helm_2to3
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_license_scanning
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_sast
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_secret_detection
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_jobs_test
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_security_container_scanning
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_security_dast
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_security_dependency_scanning
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_security_license_scanning
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_security_sast
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_implicit_security_secret_detection
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_terraform_module_base
-  redis_slot: ci_templates
   aggregation: weekly
 - name: p_ci_templates_terraform_module
-  redis_slot: ci_templates
   aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/ci_users.yml b/lib/gitlab/usage_data_counters/known_events/ci_users.yml
index 6db10366b83..49757c6e672 100644
--- a/lib/gitlab/usage_data_counters/known_events/ci_users.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ci_users.yml
@@ -1,6 +1,4 @@
 - name: ci_users_executing_deployment_job
-  redis_slot: ci_users
   aggregation: weekly
 - name: ci_users_executing_verify_environment_job
-  redis_slot: ci_users
   aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/code_review_events.yml b/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
index f64da801c39..db0c0653f63 100644
--- a/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
@@ -1,345 +1,233 @@
 ---
 - name: i_code_review_create_note_in_ipynb_diff
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_create_note_in_ipynb_diff_mr
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_create_note_in_ipynb_diff_commit
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_create_note_in_ipynb_diff
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_create_note_in_ipynb_diff_mr
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_create_note_in_ipynb_diff_commit
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_mr_diffs
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_single_file_diffs
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_mr_single_file_diffs
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_toggled_task_item_status
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_create_mr
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_create_mr
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_close_mr
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_reopen_mr
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_approve_mr
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_unapprove_mr
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_resolve_thread
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_unresolve_thread
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_edit_mr_title
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_edit_mr_desc
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_merge_mr
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_create_mr_comment
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_edit_mr_comment
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_remove_mr_comment
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_create_review_note
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_publish_review
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_create_multiline_mr_comment
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_edit_multiline_mr_comment
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_remove_multiline_mr_comment
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_add_suggestion
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_apply_suggestion
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_assigned
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_marked_as_draft
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_unmarked_as_draft
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_review_requested
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_approval_rule_added
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_approval_rule_deleted
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_approval_rule_edited
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_vs_code_api_request
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_jetbrains_api_request
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_gitlab_cli_api_request
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_create_mr_from_issue
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_mr_discussion_locked
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_mr_discussion_unlocked
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_time_estimate_changed
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_time_spent_changed
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_assignees_changed
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_reviewers_changed
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_milestone_changed
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_labels_changed
-  redis_slot: code_review
   aggregation: weekly
 # Diff settings events
 - name: i_code_review_click_diff_view_setting
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_click_single_file_mode_setting
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_click_file_browser_setting
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_click_whitespace_setting
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_diff_view_inline
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_diff_view_parallel
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_file_browser_tree_view
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_file_browser_list_view
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_diff_show_whitespace
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_diff_hide_whitespace
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_diff_single_file
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_diff_multiple_files
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_load_conflict_ui
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_resolve_conflict
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_searches_diff
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_total_suggestions_applied
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_total_suggestions_added
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_user_resolve_thread_in_issue
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_widget_nothing_merge_click_new_file
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_post_merge_delete_branch
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_post_merge_click_revert
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_post_merge_click_cherry_pick
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_post_merge_submit_revert_modal
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_post_merge_submit_cherry_pick_modal
-  redis_slot: code_review
   aggregation: weekly
 # MR Widget Extensions
 ## Test Summary
 - name: i_code_review_merge_request_widget_test_summary_view
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_test_summary_full_report_clicked
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_test_summary_expand
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_test_summary_expand_success
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_test_summary_expand_warning
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_test_summary_expand_failed
-  redis_slot: code_review
   aggregation: weekly
 ## Accessibility
 - name: i_code_review_merge_request_widget_accessibility_view
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_accessibility_full_report_clicked
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_accessibility_expand
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_accessibility_expand_success
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_accessibility_expand_warning
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_accessibility_expand_failed
-  redis_slot: code_review
   aggregation: weekly
 ## Code Quality
 - name: i_code_review_merge_request_widget_code_quality_view
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_code_quality_full_report_clicked
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_code_quality_expand
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_code_quality_expand_success
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_code_quality_expand_warning
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_code_quality_expand_failed
-  redis_slot: code_review
   aggregation: weekly
 ## Terraform
 - name: i_code_review_merge_request_widget_terraform_view
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_terraform_full_report_clicked
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_terraform_expand
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_terraform_expand_success
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_terraform_expand_warning
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_terraform_expand_failed
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_submit_review_approve
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_submit_review_comment
-  redis_slot: code_review
   aggregation: weekly
 ## License Compliance
 - name: i_code_review_merge_request_widget_license_compliance_view
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_license_compliance_full_report_clicked
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_license_compliance_expand
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_license_compliance_expand_success
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_license_compliance_expand_warning
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_license_compliance_expand_failed
-  redis_slot: code_review
   aggregation: weekly
 ## Security Reports
 - name: i_code_review_merge_request_widget_security_reports_view
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_security_reports_full_report_clicked
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_security_reports_expand
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_security_reports_expand_success
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_security_reports_expand_warning
-  redis_slot: code_review
   aggregation: weekly
 - name: i_code_review_merge_request_widget_security_reports_expand_failed
-  redis_slot: code_review
   aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index 3314997f873..d3520961665 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -1,19 +1,14 @@
 ---
 # Compliance category
 - name: g_edit_by_web_ide
-  redis_slot: edit
   aggregation: daily
 - name: g_edit_by_sfe
-  redis_slot: edit
   aggregation: daily
 - name: g_edit_by_snippet_ide
-  redis_slot: edit
   aggregation: daily
 - name: g_edit_by_live_preview
-  redis_slot: edit
   aggregation: daily
 - name: i_search_total
-  redis_slot: search
   aggregation: weekly
 - name: wiki_action
   aggregation: daily
@@ -26,209 +21,145 @@
 - name: merge_request_action
   aggregation: daily
 - name: i_source_code_code_intelligence
-  redis_slot: source_code
   aggregation: daily
 # Incident management
 - name: incident_management_alert_status_changed
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_alert_assigned
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_alert_todo
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_incident_created
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_incident_reopened
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_incident_closed
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_incident_assigned
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_incident_todo
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_incident_comment
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_incident_zoom_meeting
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_incident_relate
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_incident_unrelate
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_incident_change_confidential
-  redis_slot: incident_management
   aggregation: weekly
 # Incident management timeline events
 - name: incident_management_timeline_event_created
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_timeline_event_edited
-  redis_slot: incident_management
   aggregation: weekly
 - name: incident_management_timeline_event_deleted
-  redis_slot: incident_management
   aggregation: weekly
 # Incident management alerts
 - name: incident_management_alert_create_incident
-  redis_slot: incident_management
   aggregation: weekly
 # Testing category
 - name: i_testing_test_case_parsed
-  redis_slot: testing
   aggregation: weekly
 - name: i_testing_test_report_uploaded
-  redis_slot: testing
   aggregation: weekly
 - name: i_testing_coverage_report_uploaded
-  redis_slot: testing
   aggregation: weekly
 # Project Management group
 - name: g_project_management_issue_title_changed
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_description_changed
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_assignee_changed
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_made_confidential
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_made_visible
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_created
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_closed
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_reopened
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_label_changed
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_milestone_changed
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_cross_referenced
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_moved
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_related
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_unrelated
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_marked_as_duplicate
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_locked
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_unlocked
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_designs_added
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_designs_modified
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_designs_removed
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_due_date_changed
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_design_comments_removed
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_time_estimate_changed
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_time_spent_changed
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_comment_added
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_comment_edited
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_comment_removed
-  redis_slot: project_management
   aggregation: daily
 - name: g_project_management_issue_cloned
-  redis_slot: project_management
   aggregation: daily
 # Runner group
 - name: g_runner_fleet_read_jobs_statistics
-  redis_slot: runner
   aggregation: weekly
 # Secrets Management
 - name: i_snippets_show
-  redis_slot: snippets
   aggregation: weekly
 # Terraform
 - name: p_terraform_state_api_unique_users
-  redis_slot: terraform
   aggregation: weekly
 # Pipeline Authoring group
 - name: o_pipeline_authoring_unique_users_committing_ciconfigfile
-  redis_slot: pipeline_authoring
   aggregation: weekly
 - name: o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
-  redis_slot: pipeline_authoring
   aggregation: weekly
 - name: i_ci_secrets_management_id_tokens_build_created
-  redis_slot: ci_secrets_management
   aggregation: weekly
 # Merge request widgets
 - name: users_expanding_secure_security_report
-  redis_slot: secure
   aggregation: weekly
 - name: users_expanding_testing_code_quality_report
-  redis_slot: testing
   aggregation: weekly
 - name: users_expanding_testing_accessibility_report
-  redis_slot: testing
   aggregation: weekly
 - name: users_expanding_testing_license_compliance_report
-  redis_slot: testing
   aggregation: weekly
 - name: users_visiting_testing_license_compliance_full_report
-  redis_slot: testing
   aggregation: weekly
 - name: users_visiting_testing_manage_license_compliance
-  redis_slot: testing
   aggregation: weekly
 - name: users_clicking_license_testing_visiting_external_website
-  redis_slot: testing
   aggregation: weekly
 # Geo group
 - name: g_geo_proxied_requests
-  redis_slot: geo
   aggregation: daily
 # Manage
 - name: unique_active_user
   aggregation: weekly
 # Environments page
 - name: users_visiting_environments_pages
-  redis_slot: users
   aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/container_registry_events.yml b/lib/gitlab/usage_data_counters/known_events/container_registry_events.yml
index ac40079a6dc..aa0f9965fa7 100644
--- a/lib/gitlab/usage_data_counters/known_events/container_registry_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/container_registry_events.yml
@@ -1,16 +1,11 @@
 ---
 - name: i_container_registry_push_tag_user
   aggregation: weekly
-  redis_slot: container_registry
 - name: i_container_registry_delete_tag_user
   aggregation: weekly
-  redis_slot: container_registry
 - name: i_container_registry_push_repository_user
   aggregation: weekly
-  redis_slot: container_registry
 - name: i_container_registry_delete_repository_user
   aggregation: weekly
-  redis_slot: container_registry
 - name: i_container_registry_create_repository_user
   aggregation: weekly
-  redis_slot: container_registry
diff --git a/lib/gitlab/usage_data_counters/known_events/ecosystem.yml b/lib/gitlab/usage_data_counters/known_events/ecosystem.yml
index 03bbba663c5..6e4a893d19a 100644
--- a/lib/gitlab/usage_data_counters/known_events/ecosystem.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ecosystem.yml
@@ -1,35 +1,24 @@
 ---
 # Ecosystem category
 - name: i_ecosystem_jira_service_close_issue
-  redis_slot: ecosystem
   aggregation: weekly
 - name: i_ecosystem_jira_service_cross_reference
-  redis_slot: ecosystem
   aggregation: weekly
 - name: i_ecosystem_slack_service_issue_notification
-  redis_slot: ecosystem
   aggregation: weekly
 - name: i_ecosystem_slack_service_push_notification
-  redis_slot: ecosystem
   aggregation: weekly
 - name: i_ecosystem_slack_service_deployment_notification
-  redis_slot: ecosystem
   aggregation: weekly
 - name: i_ecosystem_slack_service_wiki_page_notification
-  redis_slot: ecosystem
   aggregation: weekly
 - name: i_ecosystem_slack_service_merge_request_notification
-  redis_slot: ecosystem
   aggregation: weekly
 - name: i_ecosystem_slack_service_note_notification
-  redis_slot: ecosystem
   aggregation: weekly
 - name: i_ecosystem_slack_service_tag_push_notification
-  redis_slot: ecosystem
   aggregation: weekly
 - name: i_ecosystem_slack_service_confidential_note_notification
-  redis_slot: ecosystem
   aggregation: weekly
 - name: i_ecosystem_slack_service_confidential_issue_notification
-  redis_slot: ecosystem
   aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/error_tracking.yml b/lib/gitlab/usage_data_counters/known_events/error_tracking.yml
index efed16c11f8..ebfd1b274f9 100644
--- a/lib/gitlab/usage_data_counters/known_events/error_tracking.yml
+++ b/lib/gitlab/usage_data_counters/known_events/error_tracking.yml
@@ -1,7 +1,5 @@
 ---
 - name: error_tracking_view_details
-  redis_slot: error_tracking
   aggregation: weekly
 - name: error_tracking_view_list
-  redis_slot: error_tracking
   aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/importer_events.yml b/lib/gitlab/usage_data_counters/known_events/importer_events.yml
index a6c90a6c762..abbd83a012b 100644
--- a/lib/gitlab/usage_data_counters/known_events/importer_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/importer_events.yml
@@ -1,18 +1,13 @@
 ---
 # Importer events
 - name: github_import_project_start
-  redis_slot: import
   aggregation: weekly
 - name: github_import_project_success
-  redis_slot: import
   aggregation: weekly
 - name: github_import_project_failure
-  redis_slot: import
   aggregation: weekly
 - name: github_import_project_cancelled
-  redis_slot: import
   aggregation: weekly
 - name: github_import_project_partially_completed
-  redis_slot: import
   aggregation: weekly
 
diff --git a/lib/gitlab/usage_data_counters/known_events/kubernetes_agent.yml b/lib/gitlab/usage_data_counters/known_events/kubernetes_agent.yml
index 9703c022ef5..b3d1c51c0e7 100644
--- a/lib/gitlab/usage_data_counters/known_events/kubernetes_agent.yml
+++ b/lib/gitlab/usage_data_counters/known_events/kubernetes_agent.yml
@@ -1,3 +1,2 @@
 - name: agent_users_using_ci_tunnel
-  redis_slot: agent
   aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/package_events.yml b/lib/gitlab/usage_data_counters/known_events/package_events.yml
index d9797635240..47cc7f98838 100644
--- a/lib/gitlab/usage_data_counters/known_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/package_events.yml
@@ -1,67 +1,45 @@
 ---
 - name: i_package_composer_deploy_token
   aggregation: weekly
-  redis_slot: package
 - name: i_package_composer_user
   aggregation: weekly
-  redis_slot: package
 - name: i_package_conan_deploy_token
   aggregation: weekly
-  redis_slot: package
 - name: i_package_conan_user
   aggregation: weekly
-  redis_slot: package
 - name: i_package_generic_deploy_token
   aggregation: weekly
-  redis_slot: package
 - name: i_package_generic_user
   aggregation: weekly
-  redis_slot: package
 - name: i_package_helm_deploy_token
   aggregation: weekly
-  redis_slot: package
 - name: i_package_helm_user
   aggregation: weekly
-  redis_slot: package
 - name: i_package_maven_deploy_token
   aggregation: weekly
-  redis_slot: package
 - name: i_package_maven_user
   aggregation: weekly
-  redis_slot: package
 - name: i_package_npm_deploy_token
   aggregation: weekly
-  redis_slot: package
 - name: i_package_npm_user
   aggregation: weekly
-  redis_slot: package
 - name: i_package_nuget_deploy_token
   aggregation: weekly
-  redis_slot: package
 - name: i_package_nuget_user
   aggregation: weekly
-  redis_slot: package
 - name: i_package_pypi_deploy_token
   aggregation: weekly
-  redis_slot: package
 - name: i_package_pypi_user
   aggregation: weekly
-  redis_slot: package
 - name: i_package_rubygems_deploy_token
   aggregation: weekly
-  redis_slot: package
 - name: i_package_rubygems_user
   aggregation: weekly
-  redis_slot: package
 - name: i_package_terraform_module_deploy_token
   aggregation: weekly
-  redis_slot: package
 - name: i_package_terraform_module_user
   aggregation: weekly
-  redis_slot: package
 - name: i_package_rpm_user
   aggregation: weekly
-  redis_slot: package
 - name: i_package_rpm_deploy_token
   aggregation: weekly
-  redis_slot: package
diff --git a/lib/gitlab/usage_data_counters/known_events/quickactions.yml b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
index 306ed79ea23..7006173cc59 100644
--- a/lib/gitlab/usage_data_counters/known_events/quickactions.yml
+++ b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
@@ -1,190 +1,127 @@
 ---
 - name: i_quickactions_assign_multiple
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_approve
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_unapprove
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_assign_single
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_assign_self
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_assign_reviewer
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_award
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_board_move
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_clone
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_close
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_confidential
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_copy_metadata_merge_request
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_copy_metadata_issue
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_create_merge_request
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_done
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_draft
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_due
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_duplicate
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_estimate
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_label
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_lock
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_merge
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_milestone
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_move
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_promote_to_incident
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_timeline
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_ready
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_reassign
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_reassign_reviewer
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_rebase
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_relabel
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_relate
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_remove_due_date
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_remove_estimate
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_remove_milestone
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_remove_time_spent
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_remove_zoom
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_reopen
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_severity
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_shrug
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_spend_subtract
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_spend_add
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_submit_review
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_subscribe
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_tableflip
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_tag
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_target_branch
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_title
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_todo
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_unassign_specific
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_unassign_all
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_unassign_reviewer
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_unlabel_specific
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_unlabel_all
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_unlock
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_unsubscribe
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_wip
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_zoom
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_link
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_invite_email_single
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_invite_email_multiple
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_add_contacts
-  redis_slot: quickactions
   aggregation: weekly
 - name: i_quickactions_remove_contacts
-  redis_slot: quickactions
   aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/work_items.yml b/lib/gitlab/usage_data_counters/known_events/work_items.yml
index 1f0cc0c8a2e..a6e5b9e1af5 100644
--- a/lib/gitlab/usage_data_counters/known_events/work_items.yml
+++ b/lib/gitlab/usage_data_counters/known_events/work_items.yml
@@ -1,28 +1,21 @@
 ---
 - name: users_updating_work_item_title
-  redis_slot: users
   aggregation: weekly
 - name: users_creating_work_items
-  redis_slot: users
   aggregation: weekly
 - name: users_updating_work_item_dates
-  redis_slot: users
   aggregation: weekly
 - name: users_updating_work_item_labels
-  redis_slot: users
   aggregation: weekly
 - name: users_updating_work_item_milestone
-  redis_slot: users
   aggregation: weekly
 - name: users_updating_work_item_iteration
   # The event tracks an EE feature.
   # It's added here so it can be aggregated into the CE/EE 'OR' aggregate metrics.
   # It will report 0 for CE instances and should not be used with 'AND' aggregators.
-  redis_slot: users
   aggregation: weekly
 - name: users_updating_weight_estimate
   # The event tracks an EE feature.
   # It's added here so it can be aggregated into the CE/EE 'OR' aggregate metrics.
   # It will report 0 for CE instances and should not be used with 'AND' aggregators.
-  redis_slot: users
   aggregation: weekly