Update Dynamic Analysis metrics

config/metrics/counts_28d/20210216183832_dast_scans.yml

----
-data_category: operational
-key_path: usage_activity_by_stage_monthly.secure.dast_scans
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: 28d
-data_source: 
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
-performance_indicator_type: []

config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml

----
-data_category: optional
-key_path: counts.dast_on_demand_pipelines
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
-value_type: number
-status: data_available
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-skip_validation: true
-performance_indicator_type: []

config/metrics/counts_28d/20210216175616_user_dast_jobs.yml → ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml

@@ -9,12 +9,11 @@ product_category: dynamic_application_security_testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate
 performance_indicator_type:
 - gmau
 - paid_gmau

config/metrics/counts_28d/20210216175618_dast_pipeline.yml → ee/config/metrics/counts_28d/20210216175618_dast_pipeline.yml

@@ -9,10 +9,9 @@ product_category: dynamic_application_security_testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
 distribution:
-- ce
+- ee
 tier:
 - ultimate
-skip_validation: true
 performance_indicator_type: []

config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml → ee/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml

@@ -4,15 +4,14 @@ key_path: usage_activity_by_stage_monthly.secure.user_api_fuzzing_jobs
 description: Count of API Fuzzing jobs by job name
 product_section: sec
 product_stage: secure
-product_group: group::fuzz testing
-product_category: 
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate
 performance_indicator_type: []

config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml → ee/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml

@@ -4,14 +4,13 @@ key_path: usage_activity_by_stage_monthly.secure.user_api_fuzzing_dnd_jobs
 description: Count of API Fuzzing `docker-in-docker` jobs by job names
 product_section: sec
 product_stage: secure
-product_group: group::fuzz testing
-product_category:
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source:
+data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate

ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml

 ---
-data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.coverage_fuzzing_pipeline
 description: Counts of Pipelines that have at least 1 coverage-guided Fuzz Testing
   job
 product_section: sec
 product_stage: secure
-product_group: group::fuzz testing
+product_group: group::dynamic analysis
 product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
+data_category: operational
 distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true
 performance_indicator_type: []

ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml

 ---
-data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.api_fuzzing_pipeline
 description: Counts of Pipelines that have at least 1 API Fuzzing Testing job
 product_section: sec
 product_stage: secure
-product_group: group::fuzz testing
+product_group: group::dynamic analysis
 product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
+data_category: operational
 distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true
 performance_indicator_type: []

config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml → ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml

 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.user_coverage_fuzzing_jobs
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Users who run a coverage fuzzing job
+product_section: sec
+product_stage: secure
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate
 performance_indicator_type:
 - gmau
 - paid_gmau

ee/config/metrics/counts_28d/20210216183832_dast_scans.yml

+---
+data_category: operational
+key_path: usage_activity_by_stage_monthly.secure.dast_scans
+description: Count of DAST scans
+product_section: sec
+product_stage: secure
+product_group: group::dynamic analysis
+product_category: dynamic_application_security_testing
+value_type: number
+status: data_available
+time_frame: 28d
+data_source: database
+distribution:
+- ee
+tier:
+- ultimate
+performance_indicator_type: []

config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml → ee/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml

 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.coverage_fuzzing_scans
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of coverage-guided fuzz test scans
+product_section: sec
+product_stage: secure
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate
 performance_indicator_type: []

config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml → ee/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml

 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.api_fuzzing_scans
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of API fuzz test scans
+product_section: sec
+product_stage: secure
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate
 performance_indicator_type: []

ee/config/metrics/counts_28d/20210607043509_user_coverage_fuzzing_scans.yml

@@ -3,8 +3,8 @@ key_path: usage_activity_by_stage_monthly.secure.user_coverage_fuzzing_scans
 description: Number of users who have run a Coverage Fuzzing scan
 product_section: sec
 product_stage: secure
-product_group: category::fuzz testing
-product_category: fuzz_testing
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444

ee/config/metrics/counts_28d/20210607043622_user_api_fuzzing_scans.yml

@@ -3,8 +3,8 @@ key_path: usage_activity_by_stage_monthly.secure.user_api_fuzzing_scans
 description: Number of users who have run a API Fuzzing scan
 product_section: sec
 product_stage: secure
-product_group: category::fuzz testing
-product_category: fuzz_testing
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444

config/metrics/counts_all/20210216175612_dast_jobs.yml → ee/config/metrics/counts_all/20210216175612_dast_jobs.yml

 ---
-data_category: operational
 key_path: counts.dast_jobs
 description: Count of DAST jobs run
 product_section: sec
@@ -10,9 +9,9 @@ value_type: number
 status: data_available
 time_frame: all
 data_source: database
+data_category: operational
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate
 performance_indicator_type: []

config/metrics/counts_all/20210216175614_user_dast_jobs.yml → ee/config/metrics/counts_all/20210216175614_user_dast_jobs.yml

 ---
-data_category: operational
 key_path: usage_activity_by_stage.secure.user_dast_jobs
 description: Count of DAST jobs
 product_section: sec
@@ -9,9 +8,9 @@ product_category: dynamic_application_security_testing
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
+data_category: operational
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate

config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml → ee/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml

@@ -4,15 +4,14 @@ key_path: counts.api_fuzzing_jobs
 description: Count of API Fuzzing jobs run by job name
 product_section: sec
 product_stage: secure
-product_group: group::fuzz testing
-product_category: 
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate
 performance_indicator_type: []

config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml → ee/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml

@@ -4,14 +4,13 @@ key_path: counts.api_fuzzing_dnd_jobs
 description: Count of API Fuzzing `docker-in-docker` jobs run by job name
 product_section: sec
 product_stage: secure
-product_group: group::fuzz testing
-product_category:
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
-- ce
+  - ee
 tier:
-- free
-skip_validation: true
+  - ultimate

config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml → ee/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml

@@ -4,14 +4,13 @@ key_path: usage_activity_by_stage.secure.user_api_fuzzing_jobs
 description: Count of API Fuzzing jobs by job name
 product_section: sec
 product_stage: secure
-product_group: group::fuzz testing
-product_category:
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate

config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml → ee/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml

@@ -4,14 +4,13 @@ key_path: usage_activity_by_stage.secure.user_api_fuzzing_dnd_jobs
 description: Count of API Fuzzing `docker-in-docker` jobs by job name
 product_section: sec
 product_stage: secure
-product_group: group::fuzz testing
-product_category:
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate

ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml

 ---
 data_category: operational
 key_path: usage_activity_by_stage.secure.coverage_fuzzing_scans
-description: 'Counts fuzzing jobs'
+description: Count of coverage-guided fuzz testing jobs
 product_section: sec
 product_stage: secure
-product_group: group::fuzz testing
-product_category: 
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source: database
 distribution:
-- ee
-tier: []
-skip_validation: true
+  - ee
+tier:
+  - ultimate
 performance_indicator_type: []

ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml

 ---
 data_category: operational
 key_path: usage_activity_by_stage.secure.api_fuzzing_scans
-description: 'Counts API fuzzing jobs'
+description: Count of API fuzz testing jobs
 product_section: sec
 product_stage: secure
-product_group: group::fuzz testing
-product_category: 
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source: database
 distribution:
 - ee
-tier: []
-skip_validation: true
+tier:
+- ultimate
 performance_indicator_type: []

config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml → ee/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml

 ---
 data_category: optional
 key_path: counts.coverage_fuzzing_jobs
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Count of coverage-guided fuzz testing jobs
+product_section: sec
+product_stage: secure
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: all
 data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate
 performance_indicator_type: []

ee/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml

+---
+key_path: counts.dast_on_demand_pipelines
+description: Count of all on-demand DAST pipelines
+product_section: sec
+product_stage: secure
+product_group: group::dynamic analysis
+product_category: dynamic_application_security_testing
+value_type: number
+status: data_available
+time_frame: all
+data_source: database
+data_category: optional
+distribution:
+- ee
+tier:
+- ultimate

config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml → ee/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml

 ---
 data_category: operational
 key_path: usage_activity_by_stage.secure.user_coverage_fuzzing_jobs
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Usage count of coverage-guided fuzz testing jobs
+product_section: sec
+product_stage: secure
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
-- ce
+- ee
 tier:
-- free
-skip_validation: true
+- ultimate

ee/config/metrics/counts_all/20210607043109_user_dast_scans.yml

@@ -10,7 +10,7 @@ status: data_available
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: all
 data_source: database
-data_category: optional
+data_category: operational
 distribution:
 - ee
 tier:

ee/config/metrics/counts_all/20210607044040_user_coverage_fuzzing_scans.yml

@@ -3,14 +3,14 @@ key_path: usage_activity_by_stage.secure.user_coverage_fuzzing_scans
 description: Number of users who have run a Coverage Fuzzing scan
 product_section: sec
 product_stage: secure
-product_group: category::fuzz testing
-product_category: fuzz_testing
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
-data_category: optional
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: all
 data_source: database
+data_category: operational
 distribution:
 - ee
 tier:

ee/config/metrics/counts_all/20210607044126_user_api_fuzzing_scans.yml

@@ -3,14 +3,15 @@ key_path: usage_activity_by_stage.secure.user_api_fuzzing_scans
 description: Number of users who have run a API Fuzzing scan
 product_section: sec
 product_stage: secure
-product_group: category::fuzz testing
-product_category: fuzz_testing
+product_group: group::dynamic analysis
+product_category: fuzz-testing
 value_type: number
 status: data_available
 data_category: optional
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: all
 data_source: database
+data_category: operational
 distribution:
 - ee
 tier: