Add latest changes from gitlab-org/gitlab@master

8 files changed, 56 insertions, 0 deletions

diff --git a/config/metrics/counts_28d/20220222215951_xmau_plan.yml b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
index bc6c40d502f..70cc27b801c 100644
--- a/config/metrics/counts_28d/20220222215951_xmau_plan.yml
+++ b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
@@ -23,6 +23,7 @@ options:
     - users_updating_work_item_labels
     - users_updating_work_item_iteration
     - users_updating_weight_estimate
+    - users_updating_work_item_milestone
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
index 9bafbe059ab..13a943c972c 100644
--- a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
+++ b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
@@ -23,6 +23,7 @@ options:
     - users_updating_work_item_labels
     - users_updating_work_item_iteration
     - users_updating_weight_estimate
+    - users_updating_work_item_milestone
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20220222215955_users_work_items.yml b/config/metrics/counts_28d/20220222215955_users_work_items.yml
index a6b169730e8..cb3dc63035f 100644
--- a/config/metrics/counts_28d/20220222215955_users_work_items.yml
+++ b/config/metrics/counts_28d/20220222215955_users_work_items.yml
@@ -23,6 +23,7 @@ options:
     - users_updating_work_item_labels
     - users_updating_work_item_iteration
     - users_updating_weight_estimate
+    - users_updating_work_item_milestone
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml b/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
new file mode 100644
index 00000000000..02edb32765e
--- /dev/null
+++ b/config/metrics/counts_28d/20221031070329_users_updating_work_item_milestone_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_milestone_monthly
+description: Unique users updating a work item's milestone
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: team_planning
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102495
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_milestone
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_7d/20220222215851_xmau_plan.yml b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
index b1776b614fb..4520652ddf1 100644
--- a/config/metrics/counts_7d/20220222215851_xmau_plan.yml
+++ b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
@@ -23,6 +23,7 @@ options:
     - users_updating_work_item_labels
     - users_updating_work_item_iteration
     - users_updating_weight_estimate
+    - users_updating_work_item_milestone
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
index 6aa913a778e..59543e71dcb 100644
--- a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
+++ b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
@@ -23,6 +23,7 @@ options:
     - users_updating_work_item_labels
     - users_updating_work_item_iteration
     - users_updating_weight_estimate
+    - users_updating_work_item_milestone
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20220222215855_users_work_items.yml b/config/metrics/counts_7d/20220222215855_users_work_items.yml
index 952f15f3050..6dc426231e9 100644
--- a/config/metrics/counts_7d/20220222215855_users_work_items.yml
+++ b/config/metrics/counts_7d/20220222215855_users_work_items.yml
@@ -23,6 +23,7 @@ options:
     - users_updating_work_item_labels
     - users_updating_work_item_iteration
     - users_updating_weight_estimate
+    - users_updating_work_item_milestone
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml b/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
new file mode 100644
index 00000000000..a06f0a5bdbe
--- /dev/null
+++ b/config/metrics/counts_7d/20221031065930_users_updating_work_item_milestone_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_milestone_weekly
+description: Unique users updating a work item's milestone
+product_section: dev
+product_stage: plan
+product_group: project_management
+product_category: team_planning
+value_type: number
+status: active
+milestone: "15.6"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/102495
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_milestone
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate