Merge branch 'update-secure-metrics-defns' into 'master'

Clean up Secure service ping metric definitions

See merge request gitlab-org/gitlab!69257

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

 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.dependency_scanning_scans
-description: Monthly number of users running Dependency Scanning Scans
+description: Number of Dependency Scanning security scans run
 product_section: sec
 product_stage: secure
 product_group: group::composition analysis

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
+description: Number of DAST security scans run
 product_section: sec
 product_stage: secure
 product_group: group::dynamic analysis

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: Count of coverage-guided fuzz test scans
+description: Number of Coverage Guided Fuzz Test security scans run
 product_section: sec
 product_stage: secure
 product_group: group::dynamic analysis

ee/config/metrics/counts_28d/20210618101233_cluster_image_scanning_scans.yml

 ---
 key_path: usage_activity_by_stage_monthly.secure.cluster_image_scanning_scans
-description: Counts cluster image scanning jobs
+description: Number of Cluster Image Scanning security scans run
 product_section: sec
 product_stage: protect
 product_group: group::container security
 product_category: container_scanning
 value_type: number
 status: implemented
-time_frame: all
+time_frame: 28d
 data_source: database
 data_category: optional
 distribution:

config/metrics/counts_28d/20210216183826_sast_scans.yml → ee/config/metrics/counts_28d/20210830231329_sast_scans.yml

 ---
-data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.sast_scans
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of SAST security scans run
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: static_application_security_testing
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
+data_category: operational
 distribution:
-- ce
+  - ee
 tier:
-- free
-skip_validation: true
-performance_indicator_type: []
+  - ultimate

config/metrics/counts_28d/20210216183830_container_scanning_scans.yml → ee/config/metrics/counts_28d/20210830231849_container_scanning_scans.yml

 ---
-data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.container_scanning_scans
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of Container Scanning security scans run
+product_section: sec
+product_stage: protect
+product_group: group::container security
+product_category: container_scanning
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
+data_category: operational
 distribution:
-- ce
+  - ee
 tier:
-- free
-skip_validation: true
-performance_indicator_type: []
+  - ultimate

config/metrics/counts_28d/20210216183834_secret_detection_scans.yml → ee/config/metrics/counts_28d/20210830231956_secret_detection_scans.yml

 ---
-data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.secret_detection_scans
-description: ''
-product_section: ''
-product_stage: ''
-product_group: ''
-product_category: ''
+description: Number of Secret Detection security scans run
+product_section: sec
+product_stage: secure
+product_group: group::static analysis
+product_category: secret_detection
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source: database
+data_category: operational
 distribution:
-- ce
+  - ee
 tier:
-- free
-skip_validation: true
-performance_indicator_type: []
+  - 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: Count of coverage-guided fuzz testing jobs
+description: Number of Coverage Fuzzing security scans run
 product_section: sec
 product_stage: secure
 product_group: group::dynamic analysis

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

 ---
 data_category: operational
 key_path: usage_activity_by_stage.secure.api_fuzzing_scans
-description: Count of API fuzz testing jobs
+description: Number of DAST API Fuzzing security scans run
 product_section: sec
 product_stage: secure
 product_group: group::dynamic analysis