Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

5 files changed, 119 insertions, 22 deletions

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 d657c5487d7..18c5dc73de2 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
@@ -164,3 +164,43 @@
   category: code_review
   aggregation: weekly
   feature_flag: usage_data_i_code_review_user_create_mr_from_issue
+- name: i_code_review_user_mr_discussion_locked
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: usage_data_i_code_review_user_mr_discussion_locked
+- name: i_code_review_user_mr_discussion_unlocked
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: usage_data_i_code_review_user_mr_discussion_unlocked
+- name: i_code_review_user_time_estimate_changed
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: usage_data_i_code_review_user_time_estimate_changed
+- name: i_code_review_user_time_spent_changed
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: usage_data_i_code_review_user_time_spent_changed
+- name: i_code_review_user_assignees_changed
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: usage_data_i_code_review_user_assignees_changed
+- name: i_code_review_user_reviewers_changed
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: usage_data_i_code_review_user_reviewers_changed
+- name: i_code_review_user_milestone_changed
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: usage_data_i_code_review_user_milestone_changed
+- name: i_code_review_user_labels_changed
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: usage_data_i_code_review_user_labels_changed
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index 79f319b2d58..80a79682338 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -439,3 +439,18 @@
   redis_slot: pipeline_authoring
   aggregation: weekly
   feature_flag: usage_data_unique_users_committing_ciconfigfile
+- name: o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
+  category: pipeline_authoring
+  redis_slot: pipeline_authoring
+  aggregation: weekly
+  feature_flag: usage_data_o_pipeline_authoring_unique_users_pushing_mr_ciconfigfile
+# Epic events
+#
+# We are using the same slot of issue events 'project_management' for
+# epic events to allow data aggregation.
+# More information in: https://gitlab.com/gitlab-org/gitlab/-/issues/322405
+- name: g_project_management_epic_created
+  category: epics_usage
+  redis_slot: project_management
+  aggregation: daily
+  feature_flag: track_epics_activity
diff --git a/lib/gitlab/usage_data_counters/known_events/ecosystem.yml b/lib/gitlab/usage_data_counters/known_events/ecosystem.yml
index 3fd02164f74..1c765bb1830 100644
--- a/lib/gitlab/usage_data_counters/known_events/ecosystem.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ecosystem.yml
@@ -20,3 +20,49 @@
   redis_slot: ecosystem
   aggregation: weekly
   feature_flag: usage_data_track_ecosystem_jira_service
+- name: i_ecosystem_slack_service_issue_notification
+  category: ecosystem
+  redis_slot: ecosystem
+  aggregation: weekly
+  feature_flag: usage_data_track_ecosystem_slack_service
+- name: i_ecosystem_slack_service_push_notification
+  category: ecosystem
+  redis_slot: ecosystem
+  aggregation: weekly
+  feature_flag: usage_data_track_ecosystem_slack_service
+- name: i_ecosystem_slack_service_deployment_notification
+  category: ecosystem
+  redis_slot: ecosystem
+  aggregation: weekly
+  feature_flag: usage_data_track_ecosystem_slack_service
+- name: i_ecosystem_slack_service_wiki_page_notification
+  category: ecosystem
+  redis_slot: ecosystem
+  aggregation: weekly
+  feature_flag: usage_data_track_ecosystem_slack_service
+- name: i_ecosystem_slack_service_merge_request_notification
+  category: ecosystem
+  redis_slot: ecosystem
+  aggregation: weekly
+  feature_flag: usage_data_track_ecosystem_slack_service
+- name: i_ecosystem_slack_service_note_notification
+  category: ecosystem
+  redis_slot: ecosystem
+  aggregation: weekly
+  feature_flag: usage_data_track_ecosystem_slack_service
+- name: i_ecosystem_slack_service_tag_push_notification
+  category: ecosystem
+  redis_slot: ecosystem
+  aggregation: weekly
+  feature_flag: usage_data_track_ecosystem_slack_service
+- name: i_ecosystem_slack_service_confidential_note_notification
+  category: ecosystem
+  redis_slot: ecosystem
+  aggregation: weekly
+  feature_flag: usage_data_track_ecosystem_slack_service
+- name: i_ecosystem_slack_service_confidential_issue_notification
+  category: ecosystem
+  redis_slot: ecosystem
+  aggregation: weekly
+  feature_flag: usage_data_track_ecosystem_slack_service
+
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 78a2a587b34..b7e583003c8 100644
--- a/lib/gitlab/usage_data_counters/known_events/package_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/package_events.yml
@@ -3,109 +3,95 @@
   category: deploy_token_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_composer_user
   category: user_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_conan_deploy_token
   category: deploy_token_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_conan_user
   category: user_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_container_deploy_token
   category: deploy_token_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_container_user
   category: user_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_debian_deploy_token
   category: deploy_token_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_debian_user
   category: user_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_generic_deploy_token
   category: deploy_token_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_generic_user
   category: user_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_golang_deploy_token
   category: deploy_token_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_golang_user
   category: user_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_maven_deploy_token
   category: deploy_token_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_maven_user
   category: user_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_npm_deploy_token
   category: deploy_token_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_npm_user
   category: user_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_nuget_deploy_token
   category: deploy_token_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_nuget_user
   category: user_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_pypi_deploy_token
   category: deploy_token_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_pypi_user
   category: user_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
+- name: i_package_rubygems_deploy_token
+  category: deploy_token_packages
+  aggregation: weekly
+  redis_slot: package
+- name: i_package_rubygems_user
+  category: user_packages
+  aggregation: weekly
+  redis_slot: package
 - name: i_package_tag_deploy_token
   category: deploy_token_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
 - name: i_package_tag_user
   category: user_packages
   aggregation: weekly
   redis_slot: package
-  feature_flag: collect_package_events_redis
diff --git a/lib/gitlab/usage_data_counters/known_events/quickactions.yml b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
index bf292047da0..0fe65afb237 100644
--- a/lib/gitlab/usage_data_counters/known_events/quickactions.yml
+++ b/lib/gitlab/usage_data_counters/known_events/quickactions.yml
@@ -324,3 +324,13 @@
   redis_slot: quickactions
   aggregation: weekly
   feature_flag: usage_data_track_quickactions
+- name: i_quickactions_invite_email_single
+  category: quickactions
+  redis_slot: quickactions
+  aggregation: weekly
+  feature_flag: usage_data_track_quickactions
+- name: i_quickactions_invite_email_multiple
+  category: quickactions
+  redis_slot: quickactions
+  aggregation: weekly
+  feature_flag: usage_data_track_quickactions