Fix release group usage ping metrics definitions

config/metrics/counts_28d/20210216181923_successful_deployments.yml

@@ -3,15 +3,17 @@ data_category: Optional
 key_path: counts_monthly.successful_deployments
 description: Total successful deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216181924_failed_deployments.yml

@@ -3,15 +3,17 @@ data_category: Optional
 key_path: counts_monthly.failed_deployments
 description: Total failed deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216181935_deployments.yml

@@ -3,15 +3,16 @@ data_category: Optional
 key_path: usage_activity_by_stage_monthly.release.deployments
 description: Unique users triggering deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216181937_failed_deployments.yml

@@ -3,15 +3,17 @@ data_category: Optional
 key_path: usage_activity_by_stage_monthly.release.failed_deployments
 description: Total failed deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216181939_releases.yml

@@ -3,15 +3,17 @@ data_category: Optional
 key_path: usage_activity_by_stage_monthly.release.releases
 description: Unique users creating release tags
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_28d/20210216181941_successful_deployments.yml

@@ -3,15 +3,17 @@ data_category: Optional
 key_path: usage_activity_by_stage_monthly.release.successful_deployments
 description: Total successful deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_all/20210201124934_deployments.yml

@@ -4,7 +4,7 @@ key_path: counts.deployments
 description: Total deployments count
 product_section: ops
 product_stage: release
-product_group: group::ops release
+product_group: group::release
 value_type: number
 status: data_available
 milestone: "8.12"

config/metrics/counts_all/20210216181249_feature_flags.yml

@@ -4,14 +4,16 @@ key_path: counts.feature_flags
 description: Number of feature flag toggles
 product_section: ops
 product_stage: release
-product_group: group::progressive delivery
-product_category:
+product_group: group::release
+product_category: feature_flags
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_all/20210216181908_deploy_keys.yml

 ---
 data_category: Optional
 key_path: counts.deploy_keys
-description:
+description: Count of deploy keys
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_all/20210216181911_successful_deployments.yml

@@ -3,15 +3,17 @@ data_category: Optional
 key_path: counts.successful_deployments
 description: Total successful deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_all/20210216181912_failed_deployments.yml

@@ -3,15 +3,17 @@ data_category: Optional
 key_path: counts.failed_deployments
 description: Total failed deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_all/20210216181914_environments.yml

@@ -3,15 +3,17 @@ data_category: Optional
 key_path: counts.environments
 description: Total available and stopped environments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_all/20210216181916_in_review_folder.yml

 ---
 data_category: Optional
 key_path: counts.in_review_folder
-description:
+description: A number of environments with name review/*
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_all/20210216181918_releases.yml

 ---
 data_category: Optional
 key_path: counts.releases
-description: Unique release tags
+description: Count of releases
 product_section: ops
-product_stage:
+product_stage: releases
 product_group: group::release
-product_category:
+product_category: release_orchestration
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_all/20210216181926_deployments.yml

@@ -3,15 +3,17 @@ data_category: Optional
 key_path: usage_activity_by_stage.release.deployments
 description: Unique users triggering deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_all/20210216181928_failed_deployments.yml

@@ -3,15 +3,17 @@ data_category: Optional
 key_path: usage_activity_by_stage.release.failed_deployments
 description: Total failed deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_all/20210216181930_releases.yml

@@ -3,15 +3,17 @@ data_category: Optional
 key_path: usage_activity_by_stage.release.releases
 description: Unique users creating release tags
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: release_orchestration
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_all/20210216181932_successful_deployments.yml

@@ -3,15 +3,17 @@ data_category: Optional
 key_path: usage_activity_by_stage.release.successful_deployments
 description: Total successful deployments
 product_section: ops
-product_stage:
+product_stage: release
 product_group: group::release
-product_category:
+product_category: continuous_delivery
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/counts_all/20210216181946_pages_domains.yml

@@ -4,14 +4,16 @@ key_path: counts.pages_domains
 description: Total GitLab Pages domains
 product_section: ops
 product_stage: release
-product_group: group::release management
-product_category:
+product_group: group::release
+product_category: pages
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/license/20210204124936_version.yml → config/metrics/license/20210204124936_pages_version.yml

@@ -2,16 +2,18 @@
 data_category: Optional
 key_path: gitlab_pages.version
 description: The version number of GitLab Pages
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+product_section: ops
+product_stage: release
+product_group: group::release
+product_category: pages
 value_type: string
 status: data_available
 time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

config/metrics/settings/20210204124934_enabled.yml → config/metrics/settings/20210204124934_pages_enabled.yml

@@ -2,9 +2,9 @@
 data_category: Optional
 key_path: gitlab_pages.enabled
 description: Whether GitLab Pages is enabled
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
+product_section: ops
+product_stage: release
+product_group: group::release
 product_category: collection
 value_type: boolean
 status: data_available
@@ -12,6 +12,8 @@ time_frame: none
 data_source: system
 distribution:
 - ce
+- ee
 tier:
 - free
-skip_validation: true
+- premium
+- ultimate

doc/development/usage_ping/dictionary.md

@@ -1156,7 +1156,7 @@ Tiers: `ultimate`
 
 ### `counts.deploy_keys`
 
-Missing description
+Count of deploy keys
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216181908_deploy_keys.yml)
 
@@ -1166,7 +1166,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.deployments`
 
@@ -1174,7 +1174,7 @@ Total deployments count
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210201124934_deployments.yml)
 
-Group: `group::ops release`
+Group: `group::release`
 
 Data Category: `Optional`
 
@@ -1224,6 +1224,20 @@ Status: `data_available`
 
 Tiers: `free`, `premium`, `ultimate`
 
+### `counts.diff_searches`
+
+Total count of merge request diff searches
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210723075525_diff_searches.yml)
+
+Group: `group::code review`
+
+Data Category: `Optional`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
 ### `counts.environments`
 
 Total available and stopped environments
@@ -1236,7 +1250,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.epic_issues`
 
@@ -1292,7 +1306,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.feature_flags`
 
@@ -1300,13 +1314,13 @@ Number of feature flag toggles
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216181249_feature_flags.yml)
 
-Group: `group::progressive delivery`
+Group: `group::release`
 
 Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.geo_event_log_max_id`
 
@@ -2864,7 +2878,7 @@ Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.in_review_folder`
 
-Missing description
+A number of environments with name review/*
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216181916_in_review_folder.yml)
 
@@ -2874,7 +2888,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.incident_issues`
 
@@ -4988,7 +5002,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.personal_snippets`
 
@@ -6728,7 +6742,7 @@ Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.releases`
 
-Unique release tags
+Count of releases
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216181918_releases.yml)
 
@@ -6738,7 +6752,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.remote_mirrors`
 
@@ -7046,7 +7060,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.suggestions`
 
@@ -7706,20 +7720,6 @@ Status: `data_available`
 
 Tiers: `free`, `premium`, `ultimate`
 
-### `counts.user_searches_diffs`
-
-Count of users who search merge request diffs
-
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210723075525_user_searches_diffs.yml)
-
-Group: `group::code review`
-
-Data Category: `Optional`
-
-Status: `implemented`
-
-Tiers: `free`, `premium`, `ultimate`
-
 ### `counts.web_hooks`
 
 Missing description
@@ -8026,7 +8026,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `counts_monthly.packages`
 
@@ -8124,7 +8124,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `counts_weekly.aggregated_metrics.code_review_category_monthly_active_users`
 
@@ -8424,29 +8424,29 @@ Tiers: `free`
 
 Whether GitLab Pages is enabled
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210204124934_enabled.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/settings/20210204124934_pages_enabled.yml)
 
-Group: `group::product intelligence`
+Group: `group::release`
 
 Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `gitlab_pages.version`
 
 The version number of GitLab Pages
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/license/20210204124936_version.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/license/20210204124936_pages_version.yml)
 
-Group: `group::product intelligence`
+Group: `group::release`
 
 Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `gitlab_shared_runners_enabled`
 
@@ -10716,20 +10716,6 @@ Status: `data_available`
 
 Tiers: `free`, `premium`, `ultimate`
 
-### `redis_hll_counters.code_review.i_code_review_searches_in_diff_monthly`
-
-Count of searches in merge request diffs
-
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210722132444_i_code_review_searches_in_diff_monthly.yml)
-
-Group: `group::code review`
-
-Data Category: `Optional`
-
-Status: `implemented`
-
-Tiers: `free`, `premium`, `ultimate`
-
 ### `redis_hll_counters.code_review.i_code_review_user_add_suggestion_monthly`
 
 Count of unique users per month who added a suggestion
@@ -11612,6 +11598,20 @@ Status: `implemented`
 
 Tiers: `free`, `premium`, `ultimate`
 
+### `redis_hll_counters.code_review.i_code_review_user_searches_diff_weekly`
+
+Count of users who search merge request diffs
+
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_7d/20210720144005_i_code_review_user_searches_diff_weekly.yml)
+
+Group: `group::code review`
+
+Data Category: `Optional`
+
+Status: `implemented`
+
+Tiers: `free`, `premium`, `ultimate`
+
 ### `redis_hll_counters.code_review.i_code_review_user_single_file_diffs_monthly`
 
 Count of unique users per month with diffs viewed file by file
@@ -20422,7 +20422,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.release.failed_deployments`
 
@@ -20436,7 +20436,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.release.projects_mirrored_with_pipelines_enabled`
 
@@ -20464,7 +20464,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.release.successful_deployments`
 
@@ -20478,7 +20478,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage.secure.api_fuzzing_scans`
 
@@ -22830,7 +22830,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.release.failed_deployments`
 
@@ -22844,7 +22844,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.release.projects_mirrored_with_pipelines_enabled`
 
@@ -22872,7 +22872,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.release.successful_deployments`
 
@@ -22886,7 +22886,7 @@ Data Category: `Optional`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `free`, `premium`, `ultimate`
 
 ### `usage_activity_by_stage_monthly.secure.api_fuzzing_pipeline`