Add latest changes from gitlab-org/gitlab@15-9-stable-eev15.9.0-rc42

3 files changed, 44 insertions, 6 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 b9f143a3a56..b13e3d631c7 100644
--- a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
@@ -595,3 +595,11 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_terraform_module_base
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
+- name: p_ci_templates_terraform_module
+  category: ci_templates
+  redis_slot: ci_templates
+  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 a64b7c4032b..ae15530f0d0 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -3,22 +3,18 @@
 - name: g_edit_by_web_ide
   category: ide_edit
   redis_slot: edit
-  expiry: 29
   aggregation: daily
 - name: g_edit_by_sfe
   category: ide_edit
   redis_slot: edit
-  expiry: 29
   aggregation: daily
 - name: g_edit_by_snippet_ide
   category: ide_edit
   redis_slot: edit
-  expiry: 29
   aggregation: daily
 - name: g_edit_by_live_preview
   category: ide_edit
   redis_slot: edit
-  expiry: 29
   aggregation: daily
 - name: i_search_total
   category: search
@@ -216,6 +212,10 @@
   category: issues_edit
   redis_slot: project_management
   aggregation: daily
+- name: g_project_management_issue_design_comments_removed
+  category: issues_edit
+  redis_slot: project_management
+  aggregation: daily
 - name: g_project_management_issue_time_estimate_changed
   category: issues_edit
   redis_slot: project_management
@@ -240,6 +240,11 @@
   category: issues_edit
   redis_slot: project_management
   aggregation: daily
+# Runner group
+- name: g_runner_fleet_read_jobs_statistics
+  category: runner
+  redis_slot: runner
+  aggregation: weekly
 # Secrets Management
 - name: i_snippets_show
   category: snippets
@@ -250,7 +255,7 @@
   category: terraform
   redis_slot: terraform
   aggregation: weekly
-# Pipeline Authoring
+# Pipeline Authoring group
 - name: o_pipeline_authoring_unique_users_committing_ciconfigfile
   category: pipeline_authoring
   redis_slot: pipeline_authoring
@@ -259,6 +264,10 @@
   category: pipeline_authoring
   redis_slot: pipeline_authoring
   aggregation: weekly
+- name: i_ci_secrets_management_id_tokens_build_created
+  category: ci_secrets_management
+  redis_slot: ci_secrets_management
+  aggregation: weekly
 # Merge request widgets
 - name: users_expanding_secure_security_report
   redis_slot: secure
@@ -297,7 +306,6 @@
 - name: unique_active_user
   category: manage
   aggregation: weekly
-  expiry: 42
 # Environments page
 - name: users_visiting_environments_pages
   category: environments
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
new file mode 100644
index 00000000000..e8b14de1769
--- /dev/null
+++ b/lib/gitlab/usage_data_counters/known_events/container_registry_events.yml
@@ -0,0 +1,22 @@
+---
+- name: i_container_registry_push_tag_user
+  category: user_container_registry
+  aggregation: weekly
+  redis_slot: container_registry
+- name: i_container_registry_delete_tag_user
+  category: user_container_registry
+  aggregation: weekly
+  redis_slot: container_registry
+- name: i_container_registry_push_repository_user
+  category: user_container_registry
+  aggregation: weekly
+  redis_slot: container_registry
+- name: i_container_registry_delete_repository_user
+  category: user_container_registry
+  aggregation: weekly
+  redis_slot: container_registry
+- name: i_container_registry_create_repository_user
+  category: user_container_registry
+  aggregation: weekly
+  redis_slot: container_registry
+  
\ No newline at end of file