Merge branch 'am-update-configure-metrics-definitions' into 'master'

Make configure group metrics valid

See merge request gitlab-org/gitlab!69758

config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_applications_cert_managers
-description: Total GitLab Managed clusters with Cert Manager enabled
+description: Count user ids from GitLab Managed clusters with Cert Manager enabled
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,9 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters_applications_cert_managers.status
-  IN (3, 5))''>_clusters_<with>_<adjective describing: ''(clusters_applications_cert_managers.status
-  IN (3, 5))''>_clusters_applications_cert_managers'
+name: 'count_distinct_user_id_from_clusters_applications_cert_managers'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_applications_helm
-description: Total GitLab Managed clusters with Helm enabled
+description: Count user ids from GitLab Managed clusters with Helm enabled
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,9 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters_applications_helm.status
-  IN (3, 5))''>_clusters_<with>_<adjective describing: ''(clusters_applications_helm.status
-  IN (3, 5))''>_clusters_applications_helm'
+name: 'count_distinct_user_id_from_clusters_applications_helm'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_applications_ingress
-description: Total GitLab Managed clusters with Ingress enabled
+description: Count user ids from GitLab Managed clusters with Ingress enabled
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,9 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters_applications_ingress.status
-  IN (3, 5))''>_clusters_<with>_<adjective describing: ''(clusters_applications_ingress.status
-  IN (3, 5))''>_clusters_applications_ingress'
+name: 'count_distinct_user_id_from_clusters_applications_ingress'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_applications_knative
-description: Total GitLab Managed clusters with Knative enabled
+description: Count user ids from GitLab Managed clusters with Knative enabled
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,9 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters_applications_knative.status
-  IN (3, 5))''>_clusters_<with>_<adjective describing: ''(clusters_applications_knative.status
-  IN (3, 5))''>_clusters_applications_knative'
+name: 'count_distinct_user_id_from_clusters_applications_knative'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175415_clusters_disabled.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_disabled
-description: Total GitLab Managed disabled clusters
+description: Number of user ids from GitLab Managed disabled clusters
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,7 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = FALSE)''>_clusters'
+name: 'count_distinct_user_id_from_disabled_clusters'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175417_clusters_enabled.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_enabled
-description: Total GitLab Managed clusters currently enabled
+description: Number of distict user ids from GitLab Managed clusters currently enabled
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,7 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = TRUE)''>_clusters'
+name: 'count_distinct_user_id_from_enabled_clusters'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_gke
-description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
+description: Number of user ids from GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,10 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.provider_type
-  = 1 AND (cluster_providers_gcp.status IN (3)) AND clusters.enabled = TRUE)''>_clusters_<with>_<adjective
-  describing: ''(clusters.provider_type = 1 AND (cluster_providers_gcp.status IN (3))
-  AND clusters.enabled = TRUE)''>_cluster_providers_gcp'
+name: 'count_distinct_user_id_from_cluster_providers_gcp'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_eks
-description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
+description: Number of user ids from GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,10 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.provider_type
-  = 2 AND (cluster_providers_aws.status IN (3)) AND clusters.enabled = TRUE)''>_clusters_<with>_<adjective
-  describing: ''(clusters.provider_type = 2 AND (cluster_providers_aws.status IN (3))
-  AND clusters.enabled = TRUE)''>_cluster_providers_aws'
+name: 'count_distinct_user_id_from_cluster_providers_aws'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_platforms_user
-description: Total GitLab Managed clusters that are user provisioned
+description: Number of user ids from GitLab Managed clusters that are user provisioned
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,8 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.provider_type
-  = 0 AND clusters.enabled = TRUE)''>_clusters'
+name: 'count_distinct_user_id_from_user_provisioned_clusters'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.instance_clusters_disabled
-description: Total GitLab Managed disabled clusters attached to the instance
+description: Number of users from GitLab Managed disabled clusters attached to the instance
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,8 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = FALSE
-  AND clusters.cluster_type = 1)''>_clusters'
+name: 'count_distinct_user_id_from_disabled_clusters_attached_to_instance'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.instance_clusters_enabled
-description: Total GitLab Managed enabled clusters attached to the instance
+description: Number of user ids from GitLab Managed enabled clusters attached to the instance
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,8 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = TRUE
-  AND clusters.cluster_type = 1)''>_clusters'
+name: 'count_distinct_user_id_from_enabaled_clusters_attached_to_instance'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.group_clusters_disabled
-description: Total GitLab Managed disabled clusters attached to groups
+description: Number of user ids GitLab Managed disabled clusters attached to groups
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,8 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = FALSE
-  AND clusters.cluster_type = 2)''>_clusters'
+name: 'count_distinct_user_id_from_clusters_attached_to_groups'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.group_clusters_enabled
-description: Total GitLab Managed enabled clusters attached to groups
+description: Count disctinct user ids from GitLab Managed enabled clusters attached to groups
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,8 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = TRUE
-  AND clusters.cluster_type = 2)''>_clusters'
+name: 'count_distinct_user_id_from_enabled_clusters_attached_to_groups'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml

 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.project_clusters_disabled
-description: Total GitLab Managed disabled clusters attached to projects
+description: Number of user ids from GitLab Managed disabled clusters attached to projects
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,8 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = FALSE
-  AND clusters.cluster_type = 3)''>_clusters'
+name: 'count_distinct_user_id_from_disabled_clusters_attached_to_projects'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml

 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.configure.project_clusters_enabled
-description: Total GitLab Managed enabled clusters attached to projects
+description: Number of user ids from GitLab Managed enabled clusters attached to projects
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,8 +17,6 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
-name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = TRUE
-  AND clusters.cluster_type = 3)''>_clusters'
+name: 'count_distinct_user_id_from_enabled_clusters_attached_to_projects'
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml

@@ -9,7 +9,7 @@ product_category: runner
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,6 +17,5 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.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
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175331_clusters_applications_helm.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.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
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.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
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175335_clusters_applications_knative.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.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
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175337_clusters_management_project.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.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
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175339_clusters_disabled.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.clusters_disabled
 description: Total GitLab Managed disabled clusters
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175341_clusters_enabled.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.clusters_enabled
 description: Total GitLab Managed clusters currently enabled
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.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
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.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
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175346_clusters_platforms_user.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.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
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.instance_clusters_disabled
 description: Total GitLab Managed disabled clusters attached to the instance
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.instance_clusters_enabled
 description: Total GitLab Managed enabled clusters attached to the instance
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175352_group_clusters_disabled.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.group_clusters_disabled
 description: Total GitLab Managed disabled clusters attached to groups
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175354_group_clusters_enabled.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.group_clusters_enabled
 description: Total GitLab Managed enabled clusters attached to groups
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175356_project_clusters_disabled.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.project_clusters_disabled
 description: Total GitLab Managed disabled clusters attached to projects
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175358_project_clusters_enabled.yml

@@ -3,13 +3,13 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.project_clusters_enabled
 description: Total GitLab Managed enabled clusters attached to projects
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -17,5 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml

@@ -3,14 +3,14 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.projects_with_prometheus_alerts
 description: Projects with Prometheus alerting enabled
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
 status: removed
 milestone_removed: '14.0'
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -18,5 +18,4 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true
 milestone: "<13.9"

ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml

@@ -3,16 +3,17 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.projects_slack_notifications_active
 description: Unique projects with Slack webhook enabled
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: chatops
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ee
-tier: []
-skip_validation: true
+tier:
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml

@@ -3,16 +3,17 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.projects_slack_slash_active
 description: Unique projects with Slack ‘/’ commands enabled
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: chatops
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ee
-tier: []
-skip_validation: true
+tier:
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"