Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42

2 files changed, 20 insertions, 16 deletions

diff --git a/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
new file mode 100644
index 00000000000..07b20fd2938
--- /dev/null
+++ b/config/metrics/counts_7d/20210201124931_g_project_management_issue_title_changed_weekly.yml
@@ -0,0 +1,20 @@
+---
+key_path: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
+description: Distinct users count that changed issue title in a group for last recent week
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
+value_type: number
+status: data_available
+milestone: 13.6
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
+time_frame: 7d
+data_source: redis_hll
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
+
diff --git a/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml b/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
deleted file mode 100644
index 997263f9e30..00000000000
--- a/config/metrics/counts_7d/g_project_management_issue_title_changed_weekly.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: g_project_management_issue_title_changed_weekly
-description: Distinct users count that changed issue title in a group for last recent week
-value_type: integer
-product_category: issue_tracking
-stage: plan
-status: data_available
-default_generation: generation_1
-full_path:
-  generation_1: redis_hll_counters.issues_edit.g_project_management_issue_title_changed_weekly
-milestone: 13.6
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229918
-group: 'group::project management'
-time_frame: 7d
-data_source: redis_hll
-distribution: [ee, ce]
-tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']