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 9498c56e06f..587f34e90c3 100644
--- a/config/metrics/counts_28d/20220222215951_xmau_plan.yml
+++ b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
@@ -20,6 +20,7 @@ options:
     - users_creating_work_items
     - users_updating_work_item_title
     - users_updating_work_item_dates
+    - users_updating_work_item_labels
 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 a02616e06ce..542f8a13118 100644
--- a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
+++ b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
@@ -20,6 +20,7 @@ options:
     - users_creating_work_items
     - users_updating_work_item_title
     - users_updating_work_item_dates
+    - users_updating_work_item_labels
 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 3e6103a6dfd..e7a95c9d335 100644
--- a/config/metrics/counts_28d/20220222215955_users_work_items.yml
+++ b/config/metrics/counts_28d/20220222215955_users_work_items.yml
@@ -20,6 +20,7 @@ options:
     - users_creating_work_items
     - users_updating_work_item_title
     - users_updating_work_item_dates
+    - users_updating_work_item_labels
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml b/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
new file mode 100644
index 00000000000..5ebb56ea936
--- /dev/null
+++ b/config/metrics/counts_28d/20221007011350_users_updating_work_item_labels_monthly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_labels_monthly
+description: Unique users updating a work item's labels
+product_category: team_planning
+product_section: dev
+product_stage: plan
+product_group: project_management
+value_type: number
+status: active
+milestone: '15.5'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100485
+time_frame: 28d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_labels
+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 ebeaa6e5060..4fb302d67ac 100644
--- a/config/metrics/counts_7d/20220222215851_xmau_plan.yml
+++ b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
@@ -20,6 +20,7 @@ options:
     - users_creating_work_items
     - users_updating_work_item_title
     - users_updating_work_item_dates
+    - users_updating_work_item_labels
 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 13f35df6530..a63adfab8aa 100644
--- a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
+++ b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
@@ -20,6 +20,7 @@ options:
     - users_creating_work_items
     - users_updating_work_item_title
     - users_updating_work_item_dates
+    - users_updating_work_item_labels
 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 fec786715b7..cb312022192 100644
--- a/config/metrics/counts_7d/20220222215855_users_work_items.yml
+++ b/config/metrics/counts_7d/20220222215855_users_work_items.yml
@@ -20,6 +20,7 @@ options:
     - users_creating_work_items
     - users_updating_work_item_title
     - users_updating_work_item_dates
+    - users_updating_work_item_labels
 data_category: optional
 distribution:
 - ce
diff --git a/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml b/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
new file mode 100644
index 00000000000..55e651328e6
--- /dev/null
+++ b/config/metrics/counts_7d/20221007010950_users_updating_work_item_labels_weekly.yml
@@ -0,0 +1,25 @@
+---
+key_path: redis_hll_counters.work_items.users_updating_work_item_labels_weekly
+description: Unique users updating a work item's labels
+product_category: team_planning
+product_section: dev
+product_stage: plan
+product_group: project_management
+value_type: number
+status: active
+milestone: '15.5'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/100485
+time_frame: 7d
+data_source: redis_hll
+data_category: optional
+instrumentation_class: RedisHLLMetric
+options:
+  events:
+    - users_updating_work_item_labels
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate