Make product_stage required

  - Make product_stage requried in
  metric defintions
 - Update stage in metrics definitions

config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.projects_with_prometheus_alerts
 description: Projects with Prometheus alerting enabled
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_28d/20210216180956_clusters.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.clusters
 description: Count users creating clusters in last 28 days.
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.clusters_applications_prometheus
 description: Users creating clusters with Prometheus enabled in last 28 days.
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.operations_dashboard_default_dashboard
 description: Active users with enabled operations dashboard
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: tracing
 value_type: number

config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_error_tracking_enabled
 description: Count of users creating projects with error tracking enabled.
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.operations_dashboard_users_with_projects_added
 description: Active users with projects on operations dashboard
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts_monthly.projects_with_alerts_created
 description: Monthly count of unique projects with HTTP alerting enabled
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.testing.testing_total_unique_counts_monthly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Total users for events under testing category
+product_section: devops
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
 value_type: number
 status: removed
 time_frame: 28d

config/metrics/counts_all/20210216175236_project_clusters_enabled.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.project_clusters_enabled
 description: Total GitLab Managed clusters 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/20210216175248_instance_clusters_disabled.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instance_clusters_disabled
 description: Total GitLab Managed disabled clusters previously 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/20210216175324_terraform_reports.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.terraform_reports
 description: Count of Terraform MR reports generated
 product_section: ops
-product_stage:
+product_stage: configure
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number

config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.grafana_integrated_projects
 description: Total Grafana integrations attached to projects
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -12,7 +12,10 @@ time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
+- premium
+- ultimate
 performance_indicator_type: []
 milestone: "<13.9"

config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: tracing
 value_type: number

config/metrics/counts_all/20210216180931_projects_prometheus_active.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_prometheus_active
 description: Count of projects with active integrations for Prometheus
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_all/20210216180933_groups_prometheus_active.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_prometheus_active
 description: Count of groups with active integrations for Prometheus
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_all/20210216180934_templates_prometheus_active.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_prometheus_active
 description: Count of active service templates for Prometheus
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_all/20210216180936_instances_prometheus_active.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_prometheus_active
 description: Count of active instance-level integrations for Prometheus
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_prometheus_active
 description: Count of active projects inheriting integrations for Prometheus
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.operations_dashboard_default_dashboard
 description: Active users with enabled operations dashboard
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.operations_dashboard_users_with_projects_added
 description: Active users with projects on operations dashboard
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_all/20210216180945_clusters.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage.monitor.clusters
 description: Users creating clusters.
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage.monitor.clusters_applications_prometheus
 description: Users creating clusters with Prometheus enabled.
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage.monitor.operations_dashboard_default_dashboard
 description: Active users with enabled operations dashboard
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage.monitor.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: tracing
 value_type: number

config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage.monitor.operations_dashboard_users_with_projects_added
 description: Active users with projects on operations dashboard
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number

config/metrics/schema.json

 {
   "type": "object",
-  "required": ["key_path", "description", "value_type", "status", "product_group", "time_frame", "data_source", "distribution", "tier", "data_category", "milestone"],
+  "required": ["key_path", "description", "value_type", "status", "product_group", "product_stage", "time_frame", "data_source", "distribution", "tier", "data_category", "milestone"],
   "properties": {
     "key_path": {
       "type": "string"

ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml

 ---
 data_category: optional
 key_path: redis_hll_counters.testing.testing_total_unique_counts_weekly
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Total users for events under testing category
+product_section: growth
+product_stage: growth
+product_group: group::product intelligence
 value_type: number
 status: removed
 time_frame: 7d

ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml

@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_incident_sla_enabled
 description: Count of projects with Incident SLA enabled
 product_section: ops
-product_stage:
+product_stage: monitor
 product_group: group::monitor
 product_category: metrics
 value_type: number