Merge branch 'tmccaslin-metrics-update' into 'master'

Update SA metrics

See merge request gitlab-org/gitlab!64580

config/metrics/counts_28d/20210216182125_user_sast_jobs.yml

@@ -9,7 +9,8 @@ product_category: static_application_security_testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
+data_category: Optional
 distribution:
 - ce
 - ee
@@ -17,4 +18,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml

@@ -9,7 +9,8 @@ product_category: secret_detection
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
+data_category: Optional
 distribution:
 - ce
 - ee
@@ -17,4 +18,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_28d/20210216182129_sast_pipeline.yml

@@ -9,7 +9,8 @@ product_category: static_application_security_testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
+data_category: Optional
 distribution:
 - ce
 - ee
@@ -17,4 +18,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml

@@ -9,7 +9,8 @@ product_category: secret_detection
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
+data_category: Optional
 distribution:
 - ce
 - ee
@@ -17,4 +18,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_all/20210216182112_sast_jobs.yml

@@ -10,6 +10,7 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
+data_category: Optional
 distribution:
 - ce
 - ee
@@ -17,4 +18,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_all/20210216182114_secret_detection_jobs.yml

 ---
 data_category: Optional
 key_path: counts.secret_detection_jobs
-description: Count of 'secret-detection' CI jobs fro the month.
+description: Count of all 'secret-detection' CI jobs.
 product_section: sec
 product_stage: secure
 product_group: group::static analysis
@@ -10,6 +10,7 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
+data_category: Optional
 distribution:
 - ce
 - ee
@@ -17,4 +18,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_all/20210216182116_user_sast_jobs.yml

 ---
 data_category: Optional
 key_path: usage_activity_by_stage.secure.user_sast_jobs
-description: Count of SAST jobs
+description: Count of SAST jobs per user
 product_section: sec
 product_stage: secure
 product_group: group::static analysis
@@ -9,7 +9,8 @@ product_category: static_application_security_testing
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
+data_category: Optional
 distribution:
 - ce
 - ee
@@ -17,4 +18,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml

 ---
 data_category: Optional
 key_path: usage_activity_by_stage.secure.user_secret_detection_jobs
-description: Count of Secret Detection Jobs
+description: Count of Secret Detection Jobs per user
 product_section: sec
 product_stage: secure
 product_group: group::static analysis
@@ -9,7 +9,8 @@ product_category: secret_detection
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
+data_category: Optional
 distribution:
 - ce
 - ee
@@ -17,4 +18,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

doc/development/usage_ping/dictionary.md

@@ -5676,7 +5676,7 @@ Tiers: `free`, `premium`, `ultimate`
 
 ### `counts.secret_detection_jobs`
 
-Count of 'secret-detection' CI jobs fro the month.
+Count of all 'secret-detection' CI jobs.
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml)
 
@@ -17312,11 +17312,11 @@ Counts dast jobs
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_all/20210216182122_dast_scans.yml)
 
-Group: `group::static analysis`
+Group: `group::dynamic analysis`
 
 Status: `data_available`
 
-Tiers:
+Tiers: `ultimate`
 
 ### `usage_activity_by_stage.secure.dependency_scanning_scans`
 
@@ -17352,11 +17352,11 @@ Group: `group::static analysis`
 
 Status: `data_available`
 
-Tiers:
+Tiers: `ultimate`
 
 ### `usage_activity_by_stage.secure.secret_detection_scans`
 
-Counts secret detection jobs
+counts secret detection jobs
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml)
 
@@ -17364,7 +17364,7 @@ Group: `group::static analysis`
 
 Status: `data_available`
 
-Tiers:
+Tiers: `ultimate`
 
 ### `usage_activity_by_stage.secure.user_api_fuzzing_dnd_jobs`
 
@@ -17524,7 +17524,7 @@ Tiers: `ultimate`
 
 ### `usage_activity_by_stage.secure.user_sast_jobs`
 
-Count of SAST jobs
+Count of SAST jobs per user
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216182116_user_sast_jobs.yml)
 
@@ -17548,7 +17548,7 @@ Tiers: `ultimate`
 
 ### `usage_activity_by_stage.secure.user_secret_detection_jobs`
 
-Count of Secret Detection Jobs
+Count of Secret Detection Jobs per user
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml)
 

ee/config/metrics/counts_all/20210216182120_sast_scans.yml

 ---
 data_category: Optional
 key_path: usage_activity_by_stage.secure.sast_scans
-description: 'Counts sast jobs'
+description: Counts sast jobs
 product_section: sec
 product_stage: secure
 product_group: group::static analysis
-product_category:
+product_category: static_application_security_testing
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
+data_category: Optional
 distribution:
 - ee
-tier: []
-skip_validation: true
+tier:
+- ultimate

ee/config/metrics/counts_all/20210216182122_dast_scans.yml

 ---
 data_category: Optional
 key_path: usage_activity_by_stage.secure.dast_scans
-description: 'Counts dast jobs'
+description: Counts dast jobs
 product_section: sec
 product_stage: secure
-product_group: group::static analysis
-product_category:
+product_group: group::dynamic analysis
+product_category: dynamic_application_security_testing
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
+data_category: Optional
 distribution:
 - ee
-tier: []
-skip_validation: true
+tier:
+- ultimate

ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml

 ---
 data_category: Optional
 key_path: usage_activity_by_stage.secure.secret_detection_scans
-description: 'Counts secret detection jobs'
+description: counts secret detection jobs
 product_section: sec
 product_stage: secure
 product_group: group::static analysis
-product_category:
+product_category: static_application_security_testing
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
+data_category: Optional
 distribution:
 - ee
-tier: []
-skip_validation: true
+tier:
+- ultimate