Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

5 files changed, 47 insertions, 23 deletions

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 a39fa7aca4f..f179f6d679d 100644
--- a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
@@ -219,6 +219,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_themekit
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_terraform
   category: ci_templates
   redis_slot: ci_templates
@@ -615,3 +619,11 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_liquibase
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
+- name: p_ci_templates_matlab
+  category: ci_templates
+  redis_slot: ci_templates
+  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 42c51ec3921..df2864bba89 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
@@ -132,6 +132,11 @@
   category: code_review
   aggregation: weekly
   feature_flag: usage_data_i_code_review_user_jetbrains_api_request
+- name: i_code_review_user_gitlab_cli_api_request
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+  feature_flag: usage_data_i_code_review_user_gitlab_cli_api_request
 - name: i_code_review_user_create_mr_from_issue
   redis_slot: code_review
   category: code_review
@@ -173,62 +178,50 @@
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: diff_settings_usage_data
 - name: i_code_review_click_single_file_mode_setting
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: diff_settings_usage_data
 - name: i_code_review_click_file_browser_setting
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: diff_settings_usage_data
 - name: i_code_review_click_whitespace_setting
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: diff_settings_usage_data
 - name: i_code_review_diff_view_inline
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: diff_settings_usage_data
 - name: i_code_review_diff_view_parallel
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: diff_settings_usage_data
 - name: i_code_review_file_browser_tree_view
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: diff_settings_usage_data
 - name: i_code_review_file_browser_list_view
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: diff_settings_usage_data
 - name: i_code_review_diff_show_whitespace
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: diff_settings_usage_data
 - name: i_code_review_diff_hide_whitespace
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: diff_settings_usage_data
 - name: i_code_review_diff_single_file
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: diff_settings_usage_data
 - name: i_code_review_diff_multiple_files
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: diff_settings_usage_data
 - name: i_code_review_user_load_conflict_ui
   redis_slot: code_review
   category: code_review
@@ -241,7 +234,6 @@
   redis_slot: code_review
   category: code_review
   aggregation: weekly
-  feature_flag: usage_data_diff_searches
 - name: i_code_review_total_suggestions_applied
   redis_slot: code_review
   category: code_review
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index fdf4bc58525..0d89a5181ec 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -25,25 +25,21 @@
   redis_slot: edit
   expiry: 29
   aggregation: daily
-  feature_flag: track_editor_edit_actions
 - name: g_edit_by_sfe
   category: ide_edit
   redis_slot: edit
   expiry: 29
   aggregation: daily
-  feature_flag: track_editor_edit_actions
 - name: g_edit_by_sse
   category: ide_edit
   redis_slot: edit
   expiry: 29
   aggregation: daily
-  feature_flag: track_editor_edit_actions
 - name: g_edit_by_snippet_ide
   category: ide_edit
   redis_slot: edit
   expiry: 29
   aggregation: daily
-  feature_flag: track_editor_edit_actions
 - name: i_search_total
   category: search
   redis_slot: search
@@ -343,22 +339,18 @@
   redis_slot: secure
   category: secure
   aggregation: weekly
-  feature_flag: users_expanding_widgets_usage_data
 - name: users_expanding_testing_code_quality_report
   redis_slot: testing
   category: testing
   aggregation: weekly
-  feature_flag: users_expanding_widgets_usage_data
 - name: users_expanding_testing_accessibility_report
   redis_slot: testing
   category: testing
   aggregation: weekly
-  feature_flag: users_expanding_widgets_usage_data
 - name: users_expanding_testing_license_compliance_report
   redis_slot: testing
   category: testing
   aggregation: weekly
-  feature_flag: users_expanding_widgets_usage_data
 - name: users_visiting_testing_license_compliance_full_report
   redis_slot: testing
   category: testing
diff --git a/lib/gitlab/usage_data_counters/known_events/epic_events.yml b/lib/gitlab/usage_data_counters/known_events/epic_events.yml
index 62b0d6dea86..82787b7bf29 100644
--- a/lib/gitlab/usage_data_counters/known_events/epic_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/epic_events.yml
@@ -188,3 +188,33 @@
   redis_slot: project_management
   aggregation: daily
   feature_flag: track_epics_activity
+
+- name: g_project_management_epic_related_added
+  category: epics_usage
+  redis_slot: project_management
+  aggregation: daily
+  feature_flag: track_epics_activity
+
+- name: g_project_management_epic_related_removed
+  category: epics_usage
+  redis_slot: project_management
+  aggregation: daily
+  feature_flag: track_epics_activity
+
+- name: g_project_management_epic_blocking_added
+  category: epics_usage
+  redis_slot: project_management
+  aggregation: daily
+  feature_flag: track_epics_activity
+
+- name: g_project_management_epic_blocking_removed
+  category: epics_usage
+  redis_slot: project_management
+  aggregation: daily
+  feature_flag: track_epics_activity
+
+- name: g_project_management_epic_blocked_added
+  category: epics_usage
+  redis_slot: project_management
+  aggregation: daily
+  feature_flag: track_epics_activity
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 a56e0a6d370..d80b711f8eb 100644
--- a/lib/gitlab/usage_data_counters/known_events/error_tracking.yml
+++ b/lib/gitlab/usage_data_counters/known_events/error_tracking.yml
@@ -3,9 +3,7 @@
   category: error_tracking
   redis_slot: error_tracking
   aggregation: weekly
-  feature_flag: track_error_tracking_activity
 - name: error_tracking_view_list
   category: error_tracking
   redis_slot: error_tracking
   aggregation: weekly
-  feature_flag: track_error_tracking_activity