Merge branch '321793-metrics' into 'master'

Update Usage Ping Metrics Definitions

See merge request gitlab-org/gitlab!63796

doc/development/usage_ping/dictionary.md

@@ -3288,15 +3288,15 @@ Tiers: `free`
 
 ### `counts.license_management_jobs`
 
-Name on the GitLab license
+Count of License Scanning jobs run
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/license/20210204124854_license_management_jobs.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml)
 
-Group: `group::product intelligence`
+Group: `group::composition analysis`
 
 Status: `data_available`
 
-Tiers: `premium`, `ultimate`
+Tiers: `ultimate`
 
 ### `counts.licenses_list_views`
 
@@ -17320,7 +17320,7 @@ Tiers:
 
 ### `usage_activity_by_stage.secure.dependency_scanning_scans`
 
-Counts dependency scanning jobs
+Total number of users running Dependency Scanning Scans
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml)
 
@@ -17416,7 +17416,7 @@ Tiers: `free`
 
 ### `usage_activity_by_stage.secure.user_dependency_scanning_jobs`
 
-no idea, Count of Dependency Scanning jobs run, it implies user but AFAIK we don't track per user
+Total number of users running Dependency Scanning jobs
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml)
 
@@ -17428,9 +17428,9 @@ Tiers: `ultimate`
 
 ### `usage_activity_by_stage.secure.user_license_management_jobs`
 
-no idea, Count of License Scanning jobs run, it implies user but AFAIK we don't track per user
+Total number of users running License Scanning jobs
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210216175218_user_license_management_jobs.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml)
 
 Group: `group::composition analysis`
 
@@ -19324,7 +19324,7 @@ Tiers: `free`
 
 ### `usage_activity_by_stage_monthly.secure.dependency_scanning_pipeline`
 
-no idea, what is this when did it get added? guess pipelines containing a DS job
+Count of pipelines with successful Dependency Scanning jobs
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml)
 
@@ -19336,15 +19336,15 @@ Tiers: `ultimate`
 
 ### `usage_activity_by_stage_monthly.secure.dependency_scanning_scans`
 
-Missing description
+Monthly number of users running Dependency Scanning Scans
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml)
 
-Group: ``
+Group: `group::composition analysis`
 
 Status: `data_available`
 
-Tiers: `free`
+Tiers: `ultimate`
 
 ### `usage_activity_by_stage_monthly.secure.sast_pipeline`
 
@@ -19456,7 +19456,7 @@ Tiers: `free`
 
 ### `usage_activity_by_stage_monthly.secure.user_dependency_scanning_jobs`
 
-no idea, Count of Dependency Scanning jobs run, it implies user and monthly, but AFAIK we don't track per user
+Monthly number of users creating Dependency Scanning jobs
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml)
 
@@ -19468,9 +19468,9 @@ Tiers: `ultimate`
 
 ### `usage_activity_by_stage_monthly.secure.user_license_management_jobs`
 
-no idea, Count of License Scanning jobs run, it implies user and monthly, but AFAIK we don't track per user
+Monthly number of users running License Scanning jobs
 
-[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/license/20210216175224_user_license_management_jobs.yml)
+[YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml)
 
 Group: `group::composition analysis`
 

ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml

 ---
 key_path: usage_activity_by_stage_monthly.secure.user_dependency_scanning_jobs
-description: no idea, Count of Dependency Scanning jobs run, it implies user and monthly,
-  but AFAIK we don't track per user
+description: Monthly number of users creating Dependency Scanning jobs
 product_section: sec
 product_stage: secure
 product_group: group::composition analysis
@@ -9,9 +8,8 @@ product_category: dependency_scanning
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true

ee/config/metrics/license/20210216175224_user_license_management_jobs.yml → ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml

 ---
 key_path: usage_activity_by_stage_monthly.secure.user_license_management_jobs
-description: no idea, Count of License Scanning jobs run, it implies user and monthly,
-  but AFAIK we don't track per user
+description: Monthly number of users running License Scanning jobs
 product_section: sec
 product_stage: secure
 product_group: group::composition analysis
 product_category: license_compliance
-value_type: string
+value_type: number
 status: data_available
-time_frame: none
-data_source:
+time_frame: 28d
+data_source: database
 distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true

ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml

 ---
 key_path: usage_activity_by_stage_monthly.secure.dependency_scanning_pipeline
-description: no idea, what is this when did it get added? guess pipelines containing
-  a DS job
+description: Count of pipelines with successful Dependency Scanning jobs
 product_section: sec
 product_stage: secure
 product_group: group::composition analysis
@@ -9,9 +8,8 @@ product_category: dependency_scanning
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true

config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml → ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml

 ---
 key_path: usage_activity_by_stage_monthly.secure.dependency_scanning_scans
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Monthly number of users running Dependency Scanning Scans
+product_section: sec
+product_stage: secure
+product_group: group::composition analysis
+product_category: dependency_scanning
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate

config/metrics/license/20210204124854_license_management_jobs.yml → ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml

 ---
 key_path: counts.license_management_jobs
-description: Name on the GitLab license
-product_section: growth
-product_stage: growth
-product_group: group::product intelligence
-product_category: collection
+description: Count of License Scanning jobs run
+product_section: sec
+product_stage: secure
+product_group: group::composition analysis
+product_category: license_compliance
 value_type: number
 status: data_available
-time_frame: none
+time_frame: all
 data_source: database
 distribution:
-- ce
+- ee
 tier:
-- premium
 - ultimate
-skip_validation: true

ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml

@@ -13,4 +13,3 @@ distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true

ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml

 ---
 key_path: usage_activity_by_stage.secure.user_dependency_scanning_jobs
-description: no idea, Count of Dependency Scanning jobs run, it implies user but AFAIK
-  we don't track per user
+description: Total number of users running Dependency Scanning jobs
 product_section: sec
 product_stage: secure
 product_group: group::composition analysis
@@ -9,9 +8,8 @@ product_category: dependency_scanning
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true

ee/config/metrics/license/20210216175218_user_license_management_jobs.yml → ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml

 ---
 key_path: usage_activity_by_stage.secure.user_license_management_jobs
-description: no idea, Count of License Scanning jobs run, it implies user but AFAIK
-  we don't track per user
+description: Total number of users running License Scanning jobs
 product_section: sec
 product_stage: secure
 product_group: group::composition analysis
 product_category: license_compliance
-value_type: string
+value_type: number
 status: data_available
-time_frame: none
-data_source:
+time_frame: all
+data_source: database
 distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true

ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml

 ---
 key_path: usage_activity_by_stage.secure.dependency_scanning_scans
-description: 'Counts dependency scanning jobs'
+description: Total number of users running Dependency Scanning Scans
 product_section: sec
 product_stage: secure
 product_group: group::composition analysis
@@ -8,9 +8,8 @@ product_category: dependency_scanning
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true