Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

6 files changed, 27 insertions, 40 deletions

diff --git a/lib/gitlab/usage_data_counters/counter_events/package_events.yml b/lib/gitlab/usage_data_counters/counter_events/package_events.yml
index 21d637e7152..a64d0ff7e24 100644
--- a/lib/gitlab/usage_data_counters/counter_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/counter_events/package_events.yml
@@ -5,12 +5,8 @@
 - i_package_conan_delete_package
 - i_package_conan_pull_package
 - i_package_conan_push_package
-- i_package_container_delete_package
-- i_package_container_pull_package
-- i_package_container_push_package
 - i_package_debian_delete_package
 - i_package_debian_pull_package
-- i_package_debian_push_package
 - i_package_delete_package
 - i_package_delete_package_by_deploy_token
 - i_package_delete_package_by_guest
@@ -56,9 +52,6 @@
 - i_package_rubygems_delete_package
 - i_package_rubygems_pull_package
 - i_package_rubygems_push_package
-- i_package_tag_delete_package
-- i_package_tag_pull_package
-- i_package_tag_push_package
 - i_package_terraform_module_delete_package
 - i_package_terraform_module_pull_package
 - i_package_terraform_module_push_package
diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
index 8fc8bb5d344..c6e9db6a314 100644
--- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb
+++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
@@ -104,7 +104,7 @@ module Gitlab
             events_names = events_for_category(category)
 
             event_results = events_names.each_with_object({}) do |event, hash|
-              hash["#{event}_weekly"] = unique_events(**weekly_time_range.merge(event_names: [event]))
+              hash["#{event}_weekly"] = unique_events(**weekly_time_range.merge(event_names: [event])) unless event == "i_package_composer_deploy_token"
               hash["#{event}_monthly"] = unique_events(**monthly_time_range.merge(event_names: [event]))
             end
 
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 d90960b344c..55ed9a42512 100644
--- a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
@@ -103,6 +103,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_security_dast_on_demand_api_scan
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_security_coverage_fuzzing
   category: ci_templates
   redis_slot: ci_templates
@@ -539,6 +543,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_implicit_security_dast_on_demand_api_scan
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_implicit_security_coverage_fuzzing
   category: ci_templates
   redis_slot: ci_templates
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index bb98a0b262a..fc610f1e2d6 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -368,8 +368,18 @@
   redis_slot: testing
   category: testing
   aggregation: weekly
+- name: users_clicking_license_testing_visiting_external_website
+  redis_slot: testing
+  category: testing
+  aggregation: weekly
 # Container Security - Network Policies
 - name: clusters_using_network_policies_ui
   redis_slot: network_policies
   category: network_policies
   aggregation: weekly
+# Geo group
+- name: g_geo_proxied_requests
+  category: geo
+  redis_slot: geo
+  aggregation: daily
+  feature_flag: track_geo_proxy_events
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 e5031599dd0..debdbd8614f 100644
--- a/lib/gitlab/usage_data_counters/known_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/package_events.yml
@@ -15,22 +15,6 @@
   category: user_packages
   aggregation: weekly
   redis_slot: package
-- name: i_package_container_deploy_token
-  category: deploy_token_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_container_user
-  category: user_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_debian_deploy_token
-  category: deploy_token_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_debian_user
-  category: user_packages
-  aggregation: weekly
-  redis_slot: package
 - name: i_package_generic_deploy_token
   category: deploy_token_packages
   aggregation: weekly
@@ -39,14 +23,6 @@
   category: user_packages
   aggregation: weekly
   redis_slot: package
-- name: i_package_golang_deploy_token
-  category: deploy_token_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_golang_user
-  category: user_packages
-  aggregation: weekly
-  redis_slot: package
 - name: i_package_helm_deploy_token
   category: deploy_token_packages
   aggregation: weekly
@@ -95,14 +71,6 @@
   category: user_packages
   aggregation: weekly
   redis_slot: package
-- name: i_package_tag_deploy_token
-  category: deploy_token_packages
-  aggregation: weekly
-  redis_slot: package
-- name: i_package_tag_user
-  category: user_packages
-  aggregation: weekly
-  redis_slot: package
 - name: i_package_terraform_module_deploy_token
   category: deploy_token_packages
   aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/quickactions.yml b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
index d831ac02dd1..44f6b42d584 100644
--- a/lib/gitlab/usage_data_counters/known_events/quickactions.yml
+++ b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
@@ -39,6 +39,10 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
+- name: i_quickactions_clear_health_status
+  category: quickactions
+  redis_slot: quickactions
+  aggregation: weekly
 - name: i_quickactions_clone
   category: quickactions
   redis_slot: quickactions
@@ -263,6 +267,10 @@
   category: quickactions
   redis_slot: quickactions
   aggregation: weekly
+- name: i_quickactions_health_status
+  category: quickactions
+  redis_slot: quickactions
+  aggregation: weekly
 - name: i_quickactions_wip
   category: quickactions
   redis_slot: quickactions