Add latest changes from gitlab-org/gitlab@master

4 files changed, 102 insertions, 0 deletions

diff --git a/config/events/i_quickactions_remove_email_multiple.yml b/config/events/i_quickactions_remove_email_multiple.yml
new file mode 100644
index 00000000000..707624db394
--- /dev/null
+++ b/config/events/i_quickactions_remove_email_multiple.yml
@@ -0,0 +1,24 @@
+---
+description: Count usage of /remove_email quickaction with multiple arguments
+category: InternalEventTracking
+action: i_quickactions_remove_email_multiple
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: seg
+product_stage: service
+product_group: respond
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138178
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/i_quickactions_remove_email_single.yml b/config/events/i_quickactions_remove_email_single.yml
new file mode 100644
index 00000000000..fea63d2ecd3
--- /dev/null
+++ b/config/events/i_quickactions_remove_email_single.yml
@@ -0,0 +1,24 @@
+---
+description: Count usage of /remove_email quickaction with a single argument
+category: InternalEventTracking
+action: i_quickactions_remove_email_single
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+- project
+- user
+- namespace
+product_section: seg
+product_stage: service
+product_group: respond
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138178
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_multiple_28d.yml b/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_multiple_28d.yml
new file mode 100644
index 00000000000..fdccb143c14
--- /dev/null
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_multiple_28d.yml
@@ -0,0 +1,27 @@
+---
+key_path: count_distinct_user_id_from_i_quickactions_remove_email_multiple_28d
+description: Unique users using the /remove_email quick action to remove multiple email participants from an issue within 28 days
+product_section: seg
+product_stage: service
+product_group: respond
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138178
+time_frame: 28d
+data_source: internal_events
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+    - i_quickactions_remove_email_multiple
+events:
+  - name: i_quickactions_remove_email_multiple
+    unique: user.id
diff --git a/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_single_28d.yml b/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_single_28d.yml
new file mode 100644
index 00000000000..2be6ace6b38
--- /dev/null
+++ b/config/metrics/counts_28d/count_distinct_user_id_from_i_quickactions_remove_email_single_28d.yml
@@ -0,0 +1,27 @@
+---
+key_path: count_distinct_user_id_from_i_quickactions_remove_email_single_28d
+description: Unique users using the /remove_email quick action to remove a single email participant from an issue within 28 days
+product_section: seg
+product_stage: service
+product_group: respond
+performance_indicator_type: []
+value_type: number
+status: active
+milestone: "16.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/138178
+time_frame: 28d
+data_source: internal_events
+data_category: optional
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+options:
+  events:
+    - i_quickactions_remove_email_single
+events:
+  - name: i_quickactions_remove_email_single
+    unique: user.id