Remove skip_validation line from metrics definition:

  - Add data source
  - Add description
  - Add group_stage

config/metrics/counts_28d/20210216181923_successful_deployments.yml

@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216181924_failed_deployments.yml

@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216181935_deployments.yml

@@ -16,7 +16,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type:
 - smau
 milestone: "<13.9"

config/metrics/counts_28d/20210216181937_failed_deployments.yml

@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216181939_releases.yml

@@ -17,7 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type:
 - gmau
 - paid_gmau

config/metrics/counts_28d/20210216181941_successful_deployments.yml

@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml

 ---
 data_category: optional
 key_path: counts_monthly.aggregated_metrics.code_review_category_monthly_active_users
-name: "0"
-description: 
-product_section: 
-product_stage: 
-product_group: 
+description: Unique users performing actions on code review events
+product_section: dev
+product_stage: devops::create
+product_group: group::code review
 product_category: 
 value_type: number
 status: data_available
 milestone: "13.12"
-introduced_by_url: 
 time_frame: 28d
-data_source: 
+data_source: redis_hll
 distribution:
 - ce
 - ee
@@ -20,5 +18,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []

config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml

 ---
 data_category: optional
 key_path: counts_monthly.aggregated_metrics.code_review_extension_category_monthly_active_users
-name: "0"
-description: 
-product_section: 
-product_stage: 
-product_group: 
+description: Number of users performing i_code_review_user_vs_code_api_request event
+product_section: dev
+product_stage: devops::create
+product_group: group::code review
 product_category: 
 value_type: number
 status: data_available
 milestone: "13.12"
-introduced_by_url: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53553
 time_frame: 28d
-data_source: 
+data_source: redis_hll
 distribution:
 - ce
 - ee
@@ -20,5 +19,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []

config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml

 ---
 data_category: optional
 key_path: counts_monthly.aggregated_metrics.code_review_group_monthly_active_users
-name: "0"
-description: 
-product_section: 
-product_stage: 
-product_group: 
+description: Number of users performing at least one of the code review events
+product_section: dev
+product_stage: devops::create
+product_group: group::code review
 product_category: 
 value_type: number
 status: data_available
 milestone: "13.12"
-introduced_by_url: 
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53553
 time_frame: 28d
-data_source: 
+data_source: redis_hll
 distribution:
 - ce
 - ee
@@ -20,5 +19,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []

config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_counts_monthly
-name: "0"
-description:
-product_section:
-product_stage:
-product_group:
-product_category:
+description: Unique users doing commits or push MRs which contains CI cifig file
+product_section: ops
+product_stage: verify
+product_group: group::pipeline authoring
+product_category: pipeline_authoring
 value_type: number
 status: data_available
 milestone: "13.12"
@@ -25,4 +24,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml → config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.terraform.p_terraform_state_api_unique_users_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Monthly active users of GitLab Managed Terraform states
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 7d
@@ -15,8 +15,11 @@ options:
   events:
   - p_terraform_state_api_unique_users
 distribution:
+- ce
 - ee
-tier: []
-skip_validation: true
+tier:
+- free
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml → config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines with implicit Auto Build runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 7d
@@ -15,8 +15,11 @@ options:
   events:
   - p_ci_templates_implicit_auto_devops
 distribution:
+- ce
 - ee
-tier: []
-skip_validation: true
+tier:
+- free
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml → config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_build_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines with implicit Auto Build runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 7d
@@ -15,8 +15,11 @@ options:
   events:
   - p_ci_templates_implicit_auto_devops_build
 distribution:
+- ce
 - ee
-tier: []
-skip_validation: true
+tier:
+- free
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml → config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_deploy_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines with implicit Auto Deploy runs
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 7d
@@ -15,8 +15,11 @@ options:
   events:
   - p_ci_templates_implicit_auto_devops_deploy
 distribution:
+- ce
 - ee
-tier: []
-skip_validation: true
+tier:
+- free
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml → config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the latest Auto Deploy template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 7d
@@ -15,8 +15,11 @@ options:
   events:
   - p_ci_templates_auto_devops
 distribution:
+- ce
 - ee
-tier: []
-skip_validation: true
+tier:
+- free
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml → config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the stable Auto Deploy template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
+milestone: '14.3'
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69204
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
@@ -15,8 +17,11 @@ options:
   events:
   - p_ci_templates_auto_devops
 distribution:
+- ce
 - ee
-tier: []
-skip_validation: true
+tier:
+- free
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml → config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_deploy_latest_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the latest Auto Deploy template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 7d
@@ -15,8 +15,11 @@ options:
   events:
   - p_ci_templates_auto_devops_deploy_latest
 distribution:
+- ce
 - ee
-tier: []
-skip_validation: true
+tier:
+- free
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml → config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_terraform_base_latest_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines that include the terraform base template from GitLab
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 7d
@@ -15,8 +15,11 @@ options:
   events:
   - p_ci_templates_terraform_base_latest
 distribution:
+- ce
 - ee
-tier: []
-skip_validation: true
+tier:
+- free
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml → config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.quickactions_total_unique_counts_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of WAU using one or more quick actions
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -82,8 +82,11 @@ options:
   - i_quickactions_invite_email_single
   - i_quickactions_invite_email_multiple
 distribution:
+- ce
 - ee
-tier: []
-skip_validation: true
+tier:
+- free
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml

 ---
 data_category: optional
 key_path: counts_weekly.aggregated_metrics.code_review_group_monthly_active_users
-name: "0"
-description:
-product_section:
-product_stage:
-product_group:
+description: Number of users performing at least one of the code review events
+product_section: dev
+product_stage: devops::create
+product_group: group::code review
 product_category:
 value_type: number
 status: data_available
 milestone: "13.12"
-introduced_by_url:
 time_frame: 7d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
 - ee
@@ -20,4 +18,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
+

config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml

 ---
 data_category: optional
 key_path: counts_weekly.aggregated_metrics.code_review_category_monthly_active_users
-name: "0"
-description:
-product_section:
-product_stage:
-product_group:
+description: Unique users performing actions on code review events
+product_section: dev
+product_stage: devops::create
+product_group: group::code review
 product_category:
 value_type: number
 status: data_available
 milestone: "13.12"
-introduced_by_url:
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53553/
 time_frame: 7d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
 - ee
@@ -20,4 +19,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
+

config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml

 ---
 data_category: optional
 key_path: counts_weekly.aggregated_metrics.code_review_extension_category_monthly_active_users
-name: ""
-description:
-product_section:
-product_stage:
-product_group:
+description: Number of users performing code review extension_category events
+product_section: dev
+product_stage: devops::create
+product_group: group::code review
 product_category:
 value_type: number
 status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: 7d
-data_source:
+data_source: redis_hll
 distribution:
 - ce
 - ee
@@ -20,4 +19,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.pipeline_authoring.pipeline_authoring_total_unique_counts_weekly
-name: "0"
-description:
-product_section:
-product_stage:
-product_group:
-product_category:
+description: Unique users doing commits or push MRs which contains CI cifig file
+product_section: ops
+product_stage: verify
+product_group: group::pipeline authoring
+product_category: pipeline_authoring
 value_type: number
 status: data_available
 milestone: "13.12"
@@ -25,4 +24,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_7d/20210902000809_p_ci_templates_implicit_auto_devops_deploy_latest_weekly.yml

 ---
 key_path: redis_hll_counters.ci_templates.p_ci_templates_implicit_auto_devops_deploy_latest_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the latest Auto Deploy template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: implemented
 milestone: '14.3'

config/metrics/counts_all/20210216174856_p_analytics_repo.yml

@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml

@@ -13,8 +13,10 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml

@@ -13,8 +13,10 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml

@@ -12,8 +12,10 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175231_auto_devops_disabled.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.auto_devops_disabled
 description: Projects with Auto DevOps template disabled
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: auto_devops
 value_type: number
@@ -12,8 +12,10 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175232_clusters.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters
 description: Total GitLab Managed clusters both enabled and disabled
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175238_group_clusters_enabled.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.group_clusters_enabled
 description: Total GitLab Managed clusters attached to groups
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instance_clusters_enabled
 description: Total GitLab Managed clusters attached to the instance
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175244_project_clusters_disabled.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.project_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to projects
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175246_group_clusters_disabled.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.group_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to groups
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_platforms_eks
 description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_platforms_gke
 description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175253_clusters_platforms_user.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_platforms_user
 description: Total GitLab Managed clusters that are user provisioned
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175255_clusters_applications_helm.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_helm
 description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_ingress
 description: Total GitLab Managed clusters with GitLab Managed App:Ingress installed
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_cert_managers
 description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager installed
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_crossplane
 description: Total GitLab Managed clusters with GitLab Managed App:Crossplane installed
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_prometheus
 description: Total GitLab Managed clusters with GitLab Managed App:Prometheus installed
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175307_clusters_applications_knative.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_knative
 description: Total GitLab Managed clusters with GitLab Managed App:Knative installed
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_elastic_stack
 description: Total GitLab Managed clusters with GitLab Managed App:Elastic Stack installed
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_jupyter
 description: Total GitLab Managed clusters with GitLab Managed App:Jupyter installed
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml

@@ -3,7 +3,7 @@ data_category: operational
 key_path: counts.clusters_applications_cilium
 description: Total GitLab Managed clusters with GitLab Managed App:Cilium installed
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175314_clusters_management_project.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_management_project
 description: Total GitLab Managed clusters with defined cluster management project
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175621_web_hooks.yml

 ---
 data_category: optional
 key_path: counts.web_hooks
-description:
+description: Count of web hooks
 product_section: dev
 product_stage: ecosystem
 product_group: group::integrations
@@ -12,8 +12,10 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216180410_pool_repositories.yml

@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_prometheus_active
 description: Count of active groups inheriting integrations for Prometheus
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216181009_lfs_objects.yml

 ---
 data_category: optional
 key_path: counts.lfs_objects
-description:
+description: Count of lfs objects
 product_section: ops
 product_stage: create
 product_group: group::create
@@ -12,8 +12,10 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210303153004_package_events_i_package_rubygems_push_package.yml

@@ -19,4 +19,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
+

config/metrics/counts_all/20210423005644_i_analytics_dev_ops_adoption.yml

 ---
 data_category: optional
 key_path: analytics_unique_visits.i_analytics_dev_ops_adoption
-name: "<please fill metric name, suggested format is: {subject}_{verb}{ing|ed}_{object} eg: users_creating_epics or merge_requests_viewed_in_single_file_mode>"
-description:
-product_section:
-product_stage:
-product_group:
+description: Unique users viewing analytics devops adoption
+product_section: dev
+product_stage: manage
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
 milestone: "13.11"
-introduced_by_url:
 time_frame: all
-data_source:
+data_source: redis_hll
 distribution:
 - ce
-# tier:
-# - free
-# - premium
-# - ultimate
-skip_validation: true
+- ee
+tier:
+- free
+- premium
+- ultimate
+

config/metrics/counts_all/20210428142406_users_viewing_analytics_group_devops_adoption.yml

 ---
 data_category: optional
 key_path: analytics_unique_visits.users_viewing_analytics_group_devops_adoption
-name: "<please fill metric name, suggested format is: {subject}_{verb}{ing|ed}_{object} eg: users_creating_epics or merge_requests_viewed_in_single_file_mode>"
-description:
-product_section:
-product_stage:
-product_group:
+name: unique_users_viewing_analytics_group_devops_adoption
+description: Unique users viewing analytics group devops adoption
+product_section: dev
+product_stage: manage
+product_group: group::optimize
 product_category:
 value_type: number
 status: data_available
 milestone: "13.12"
-introduced_by_url:
 time_frame: all
-data_source:
+data_source: redis_hll
 distribution:
 - ce
 - ee
@@ -20,4 +19,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/settings/20210204124906_ldap_enabled.yml

@@ -2,18 +2,20 @@
 data_category: optional
 key_path: ldap_enabled
 description: Whether LDAP is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: boolean
 status: data_available
 time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/settings/20210204124910_omniauth_enabled.yml

@@ -2,18 +2,20 @@
 data_category: optional
 key_path: omniauth_enabled
 description: Whether OmniAuth is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
 value_type: boolean
 status: data_available
 time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/settings/20210204124918_signup_enabled.yml

@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/settings/20210216183248_pg_system_id.yml

@@ -12,8 +12,10 @@ time_frame: all
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.value_stream_management_customized_group_stages
-description:
+description: Number of custom value stream analytics stages.
 product_section: dev
-product_stage:
+product_stage: manage
 product_group: group::manage
 product_category:
 value_type: number
@@ -15,6 +15,5 @@ distribution:
 tier:
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml → ee/config/metrics/counts_28d/20210427213346_geo_secondary_web_oauth_users.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.enablement.geo_secondary_web_oauth_users
-name: ""
-description: 
-product_section: 
-product_stage: 
-product_group: 
+description: Number of distinct owner ids from secodary geo nodes oauth access grants
+product_section: enablement
+product_stage: enablement
+product_group: group::geo
 product_category: 
 value_type: number
 status: data_available
 milestone: "13.12"
 introduced_by_url: 
 time_frame: 28d
-data_source: 
+data_source: database
 distribution:
-- ce
 - ee
 tier:
-- free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type:
 - gmau
 - paid_gmau

ee/config/metrics/counts_28d/20210507171840_epic_boards_usage_total_unique_counts_monthly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.epic_boards_usage.epic_boards_usage_total_unique_counts_monthly
-name: '0'
-description: 
-product_section: 
-product_stage: 
-product_group: 
-product_category: 
+description: Number of users creating, viewing or updating epic boards
+product_section: dev
+product_stage: plan
+product_group: group::product planning
+product_category: epics_usage
 value_type: number
 status: data_available
 milestone: '13.12'
-introduced_by_url: 
 time_frame: 28d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
@@ -23,5 +21,4 @@ distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true
 performance_indicator_type: []

ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.issues_edit.g_project_management_issue_removed_from_epic_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of WAU removing an issue from an epic
+product_section: dev
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -16,7 +16,8 @@ options:
   - g_project_management_issue_removed_from_epic
 distribution:
 - ee
-tier: []
-skip_validation: true
+tier:
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.ci_secrets_management.i_ci_secrets_management_vault_build_created_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Weekly active users creating pipelines that that have the Vault JWT
+  with it.'
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: secrets_management
 value_type: number
 status: data_available
 time_frame: 7d
@@ -16,7 +17,7 @@ options:
   - i_ci_secrets_management_vault_build_created
 distribution:
 - ee
-tier: []
-skip_validation: true
+tier:
+- premium
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_auto_devops_build_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of pipelines using the Auto Build template
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category: infrastructure_as_code
 value_type: number
 status: data_available
 time_frame: 7d
@@ -15,8 +15,11 @@ options:
   events:
   - p_ci_templates_auto_devops
 distribution:
+- ce
 - ee
-tier: []
-skip_validation: true
+tier:
+- free
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_7d/20210507171838_epic_boards_usage_total_unique_counts_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.epic_boards_usage.epic_boards_usage_total_unique_counts_weekly
-name: "0"
-description: 
-product_section: 
-product_stage: 
-product_group: 
-product_category: 
+description: Number of users creating, viewing or updating epic boards
+product_section: dev
+product_stage: plan
+product_group: group::product planning
+product_category: epics_usage
 value_type: number
 status: data_available
 milestone: "13.12"
-introduced_by_url: 
 time_frame: 7d
 data_source: redis_hll
 instrumentation_class: RedisHLLMetric
@@ -23,5 +21,4 @@ distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true
 performance_indicator_type: []

ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml

@@ -15,6 +15,5 @@ distribution:
 tier:
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml

@@ -15,6 +15,5 @@ distribution:
 tier:
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml

@@ -9,12 +9,11 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ee
 tier:
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml → ee/config/metrics/counts_all/20210427212450_geo_secondary_web_oauth_users.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage.enablement.geo_secondary_web_oauth_users
-name: ""
-description:
-product_section:
-product_stage:
-product_group:
+description: Number of distinct owner ids from secodary geo nodes oauth access grants
+product_section: enablement
+product_stage: enablement
+product_group: group::geo
 product_category:
 value_type: number
 status: data_available
 milestone: "13.12"
 introduced_by_url:
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
 - ee
 tier:
-- free
 - premium
 - ultimate
-skip_validation: true

ee/config/metrics/settings/20210216180813_group_saml_enabled.yml

@@ -4,7 +4,7 @@ key_path: usage_activity_by_stage.manage.group_saml_enabled
 description: Has the instance enabled Group SAML SSO `https://docs.gitlab.com/ee/user/group/saml_sso/`
   on at least 1 group?
 product_section: dev
-product_stage:
+product_stage: manage
 product_group: group::manage
 product_category:
 value_type: boolean
@@ -15,6 +15,6 @@ distribution:
 - ee
 tier:
 - premium
-skip_validation: true
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"