Merge branch 'ping-metric-sources-for-container-security' into 'master'

Container Scanning group data dictionary updates

See merge request gitlab-org/gitlab!57067

config/metrics/counts_all/20210216175446_network_policy_forwards.yml

@@ -9,7 +9,7 @@ product_category: container_network_security
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_all/20210216175448_network_policy_drops.yml

@@ -9,7 +9,7 @@ product_category: container_network_security
 value_type: number
 status: data_available
 time_frame: all
-data_source: database
+data_source: redis
 distribution:
 - ce
 - ee
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

doc/development/usage_ping/dictionary.md

@@ -15562,7 +15562,7 @@ Tiers: `free`
 
 ### `usage_activity_by_stage.secure.user_container_scanning_jobs`
 
-no idea, Count of Container Scanning jobs run, it implies user but AFAIK we don't track per user
+Distinct count per user of Container Scanning jobs run
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml)
 
@@ -17398,7 +17398,7 @@ Tiers: `free`
 
 ### `usage_activity_by_stage_monthly.secure.container_scanning_pipeline`
 
-no idea, what is this when did it get added? guess pipelines containing a CS job
+Pipelines containing a Container Scanning job
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml)
 
@@ -17566,7 +17566,7 @@ Tiers: `free`
 
 ### `usage_activity_by_stage_monthly.secure.user_container_scanning_jobs`
 
-no idea, Count of Container Scanning jobs run, it implies user and monthly, but AFAIK we don't track per user
+Distinct count per user of Container Scanning jobs run monthly
 
 [YAML definition](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml)
 

ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml

 ---
 key_path: usage_activity_by_stage_monthly.secure.user_container_scanning_jobs
-description: no idea, Count of Container Scanning jobs run, it implies user and monthly,
-  but AFAIK we don't track per user
+description: Distinct count per user of Container Scanning jobs run monthly
 product_section: sec
 product_stage: protect
 product_group: group::container security
@@ -9,9 +8,8 @@ product_category: container_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/counts_28d/20210216175507_container_scanning_pipeline.yml

 ---
 key_path: usage_activity_by_stage_monthly.secure.container_scanning_pipeline
-description: no idea, what is this when did it get added? guess pipelines containing
-  a CS job
+description: Pipelines containing a Container Scanning job
 product_section: sec
 product_stage: protect
 product_group: group::container security
@@ -9,9 +8,8 @@ product_category: container_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/counts_all/20210216175501_user_container_scanning_jobs.yml

 ---
 key_path: usage_activity_by_stage.secure.user_container_scanning_jobs
-description: no idea, Count of Container Scanning jobs run, it implies user but AFAIK
-  we don't track per user
+description: Distinct count per user of Container Scanning jobs run
 product_section: sec
 product_stage: protect
 product_group: group::container security
@@ -9,9 +8,8 @@ product_category: container_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/counts_all/20210216175503_container_scanning_scans.yml

@@ -8,9 +8,8 @@ product_category: container_scanning
 value_type: number
 status: data_available
 time_frame: all
-data_source:
+data_source: database
 distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true