Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

7 files changed, 43 insertions, 4 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 1e8918c7c96..eb040e9e819 100644
--- a/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
@@ -10,13 +10,17 @@ module Gitlab::UsageDataCounters
         expanded_template_name = expand_template_name(template)
         return unless expanded_template_name
 
-        Gitlab::UsageDataCounters::HLLRedisCounter.track_event(
-          ci_template_event_name(expanded_template_name, config_source), values: project.id
-        )
+        event_name = ci_template_event_name(expanded_template_name, config_source)
+        Gitlab::UsageDataCounters::HLLRedisCounter.track_event(event_name, values: project.id)
 
         namespace = project.namespace
         if Feature.enabled?(:route_hll_to_snowplow, namespace)
-          Gitlab::Tracking.event(name, 'ci_templates_unique', namespace: namespace, user: user, project: project)
+          context = Gitlab::Tracking::ServicePingContext.new(data_source: :redis_hll,
+                                                             event: event_name).to_context
+          label = 'redis_hll_counters.ci_templates.ci_templates_total_unique_counts_monthly'
+          Gitlab::Tracking.event(name, 'ci_templates_unique', namespace: namespace,
+                                                              project: project, context: [context], user: user,
+                                                              label: label)
         end
       end
 
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 a64d0ff7e24..f7ddc53f50d 100644
--- a/lib/gitlab/usage_data_counters/counter_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/counter_events/package_events.yml
@@ -55,3 +55,5 @@
 - i_package_terraform_module_delete_package
 - i_package_terraform_module_pull_package
 - i_package_terraform_module_push_package
+- i_package_rpm_push_package
+- i_package_rpm_pull_package
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index c13c7657576..c1720b26a22 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -127,6 +127,11 @@
   category: testing
   redis_slot: testing
   aggregation: weekly
+- name: i_testing_coverage_report_uploaded
+  category: testing
+  redis_slot: testing
+  aggregation: weekly
+  feature_flag: usage_data_ci_i_testing_coverage_report_uploaded
 # Project Management group
 - name: g_project_management_issue_title_changed
   category: issues_edit
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 debdbd8614f..ef8d02fa365 100644
--- a/lib/gitlab/usage_data_counters/known_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/package_events.yml
@@ -79,3 +79,11 @@
   category: user_packages
   aggregation: weekly
   redis_slot: package
+- name: i_package_rpm_user
+  category: user_packages
+  aggregation: weekly
+  redis_slot: package
+- name: i_package_rpm_deploy_token
+  category: deploy_token_packages
+  aggregation: weekly
+  redis_slot: package
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 ee828fc0f72..d088b6d7e5a 100644
--- a/lib/gitlab/usage_data_counters/known_events/work_items.yml
+++ b/lib/gitlab/usage_data_counters/known_events/work_items.yml
@@ -19,6 +19,11 @@
   redis_slot: users
   aggregation: weekly
   feature_flag: track_work_items_activity
+- name: users_updating_work_item_milestone
+  category: work_items
+  redis_slot: users
+  aggregation: weekly
+  feature_flag: track_work_items_activity
 - 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.
@@ -27,3 +32,11 @@
   redis_slot: users
   aggregation: weekly
   feature_flag: track_work_items_activity
+- 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.
+  category: work_items
+  redis_slot: users
+  aggregation: weekly
+  feature_flag: track_work_items_activity
diff --git a/lib/gitlab/usage_data_counters/kubernetes_agent_counter.rb b/lib/gitlab/usage_data_counters/kubernetes_agent_counter.rb
index 8b9ca0fc220..d6e05f30a0d 100644
--- a/lib/gitlab/usage_data_counters/kubernetes_agent_counter.rb
+++ b/lib/gitlab/usage_data_counters/kubernetes_agent_counter.rb
@@ -8,6 +8,8 @@ module Gitlab
 
       class << self
         def increment_event_counts(events)
+          return unless events.present?
+
           validate!(events)
 
           events.each do |event, incr|
diff --git a/lib/gitlab/usage_data_counters/work_item_activity_unique_counter.rb b/lib/gitlab/usage_data_counters/work_item_activity_unique_counter.rb
index a0fd04596fc..b99c9ebb24f 100644
--- a/lib/gitlab/usage_data_counters/work_item_activity_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/work_item_activity_unique_counter.rb
@@ -7,6 +7,7 @@ module Gitlab
       WORK_ITEM_TITLE_CHANGED = 'users_updating_work_item_title'
       WORK_ITEM_DATE_CHANGED = 'users_updating_work_item_dates'
       WORK_ITEM_LABELS_CHANGED = 'users_updating_work_item_labels'
+      WORK_ITEM_MILESTONE_CHANGED = 'users_updating_work_item_milestone'
 
       class << self
         def track_work_item_created_action(author:)
@@ -25,6 +26,10 @@ module Gitlab
           track_unique_action(WORK_ITEM_LABELS_CHANGED, author)
         end
 
+        def track_work_item_milestone_changed_action(author:)
+          track_unique_action(WORK_ITEM_MILESTONE_CHANGED, author)
+        end
+
         private
 
         def track_unique_action(action, author)