Merge branch '321812-cluster-metrics' into 'master'

Update Usage Ping Metrics - Cluster / Ops metrics

See merge request gitlab-org/gitlab!60025

config/metrics/counts_28d/20210216180956_clusters.yml

 ---
 key_path: usage_activity_by_stage_monthly.monitor.clusters
-description: Total GitLab Managed clusters both enabled and disabled
+description: Count users creating clusters in last 28 days.
 product_section: ops
 product_stage:
 product_group: group::monitor
@@ -8,9 +8,11 @@ product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml

 ---
 key_path: usage_activity_by_stage_monthly.monitor.clusters_applications_prometheus
-description: Total GitLab Managed clusters with Prometheus enabled
+description: Users creating clusters with Prometheus enabled in last 28 days.
 product_section: ops
 product_stage:
 product_group: group::monitor
@@ -8,9 +8,11 @@ product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml

@@ -4,13 +4,15 @@ description: Active users with enabled operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate

config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml

@@ -4,13 +4,15 @@ description: Active users with projects on operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate

config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml

@@ -4,13 +4,15 @@ description: Active users with enabled operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate

config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml

@@ -4,13 +4,15 @@ description: Active users with projects on operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate

config/metrics/counts_all/20210216180945_clusters.yml

 ---
 key_path: usage_activity_by_stage.monitor.clusters
-description: Total GitLab Managed clusters both enabled and disabled
+description: Users creating clusters.
 product_section: ops
 product_stage:
 product_group: group::monitor
@@ -8,9 +8,11 @@ product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate

config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml

 ---
 key_path: usage_activity_by_stage.monitor.clusters_applications_prometheus
-description: Total GitLab Managed clusters with Prometheus enabled
+description: Users creating clusters with Prometheus enabled.
 product_section: ops
 product_stage:
 product_group: group::monitor
@@ -8,9 +8,11 @@ product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate

config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml

@@ -4,13 +4,14 @@ description: Active users with enabled operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium

config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml

@@ -4,13 +4,15 @@ description: Active users with projects on operations dashboard
 product_section: ops
 product_stage:
 product_group: group::monitor
-product_category:
+product_category: metrics
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+  - ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - free
+  - premium
+  - ultimate

doc/development/usage_ping/dictionary.md

@@ -3018,7 +3018,7 @@ Group: `group::monitor`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.operations_dashboard_users_with_projects_added`
 
@@ -3030,7 +3030,7 @@ Group: `group::monitor`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.package_events_i_package_composer_delete_package`
 
@@ -15564,7 +15564,7 @@ Tiers:
 
 ### `usage_activity_by_stage.monitor.clusters`
 
-Total GitLab Managed clusters both enabled and disabled
+Users creating clusters.
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180945_clusters.yml)
 
@@ -15572,11 +15572,11 @@ Group: `group::monitor`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.monitor.clusters_applications_prometheus`
 
-Total GitLab Managed clusters with Prometheus enabled
+Users creating clusters with Prometheus enabled.
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml)
 
@@ -15584,7 +15584,7 @@ Group: `group::monitor`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.monitor.operations_dashboard_default_dashboard`
 
@@ -15596,7 +15596,7 @@ Group: `group::monitor`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`
 
 ### `usage_activity_by_stage.monitor.operations_dashboard_users_with_projects_added`
 
@@ -15608,7 +15608,7 @@ Group: `group::monitor`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.monitor.projects_incident_sla_enabled`
 
@@ -17496,7 +17496,7 @@ Tiers:
 
 ### `usage_activity_by_stage_monthly.monitor.clusters`
 
-Total GitLab Managed clusters both enabled and disabled
+Count users creating clusters in last 28 days.
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180956_clusters.yml)
 
@@ -17504,11 +17504,11 @@ Group: `group::monitor`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.monitor.clusters_applications_prometheus`
 
-Total GitLab Managed clusters with Prometheus enabled
+Users creating clusters with Prometheus enabled in last 28 days.
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml)
 
@@ -17516,7 +17516,7 @@ Group: `group::monitor`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.monitor.operations_dashboard_default_dashboard`
 
@@ -17528,7 +17528,7 @@ Group: `group::monitor`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.monitor.operations_dashboard_users_with_projects_added`
 
@@ -17540,7 +17540,7 @@ Group: `group::monitor`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.monitor.projects_incident_sla_enabled`