Add latest changes from gitlab-org/gitlab@master

6 files changed, 49 insertions, 36 deletions

diff --git a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
index 51991dada22..6bb7cc3c206 100644
--- a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
+++ b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
@@ -1,18 +1,20 @@
 ---
 data_category: Operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_active
-description: 
+description:  Distinct count of creator_id from projects with an active Jira integration.
 product_section: dev
-product_stage: 
-product_group: group::plan
-product_category: 
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
 performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
index e82186f4c78..149bdb158de 100644
--- a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
@@ -1,18 +1,20 @@
 ---
 data_category: Operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_dvcs_cloud_active
-description: 
+description: Distinct count of creator_id from projects with an active Jira Cloud DVCS integration.
 product_section: dev
-product_stage: 
-product_group: group::plan
-product_category: 
+product_stage: ecosystem
+product_group: group::integration
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
 performance_indicator_type: []
diff --git a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
index 500800a6285..66af5e99b78 100644
--- a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
@@ -1,18 +1,21 @@
 ---
 data_category: Operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_dvcs_server_active
-description: 
+description: Distinct count of creator_id from projects with an active Jira Server DVCS integration.
 product_section: dev
-product_stage: 
-product_group: group::plan
-product_category: 
+product_stage: ecosystem
+product_group: group::integration
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
 performance_indicator_type: []
+
diff --git a/config/metrics/counts_all/20210216181126_projects_jira_active.yml b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
index 5b090a23958..c2f723758da 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -1,17 +1,19 @@
 ---
 data_category: Optional
 key_path: usage_activity_by_stage.plan.projects_jira_active
-description:
+description: Distinct count of creator_id from projects with an active Jira integration.
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: ecosystem
+product_group: group::integrations
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
index fe4065871a7..c4f3e098d32 100644
--- a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
@@ -1,17 +1,19 @@
 ---
 data_category: Optional
 key_path: usage_activity_by_stage.plan.projects_jira_dvcs_cloud_active
-description:
+description: Distinct count of creator_id from projects with an active Jira Cloud DVCS integration.
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: ecosystem
+product_group: group::integration
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
diff --git a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
index 77df3bac77e..de4f2923c8a 100644
--- a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
@@ -1,17 +1,19 @@
 ---
 data_category: Optional
 key_path: usage_activity_by_stage.plan.projects_jira_dvcs_server_active
-description:
+description: Distinct count of creator_id from projects with an active Jira Server DVCS integration.
 product_section: dev
-product_stage:
-product_group: group::plan
-product_category:
+product_stage: ecosystem
+product_group: group::integration
+product_category: integrations
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate