Merge branch 'protect_deprecate_waf_metrics' into 'master'

Deprecate modsecurity metrics and remove skip validation

See merge request gitlab-org/gitlab!57501

config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml

@@ -7,7 +7,7 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml

@@ -7,7 +7,7 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
@@ -17,4 +17,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml

@@ -6,7 +6,7 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml

@@ -6,7 +6,7 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml

@@ -6,7 +6,7 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml

@@ -6,7 +6,7 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml

@@ -6,9 +6,9 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: boolean
-status: data_available
+status: deprecated
 time_frame: none
-data_source:
+data_source: database
 distribution:
 - ce
 - ee
@@ -16,4 +16,3 @@ tier:
 - free
 - premium
 - ultimate
-skip_validation: true

doc/development/usage_ping/dictionary.md

@@ -2056,7 +2056,7 @@ Whether or not ModSecurity is set to blocking mode
 
 Group: `group::container security`
 
-Status: `data_available`
+Status: `deprecated`
 
 Tiers: `free`, `premium`, `ultimate`
 
@@ -2068,7 +2068,7 @@ Whether or not ModSecurity is disabled within Ingress
 
 Group: `group::container security`
 
-Status: `data_available`
+Status: `deprecated`
 
 Tiers: `free`, `premium`, `ultimate`
 
@@ -2080,7 +2080,7 @@ Whether or not ModSecurity is set to logging mode
 
 Group: `group::container security`
 
-Status: `data_available`
+Status: `deprecated`
 
 Tiers: `free`, `premium`, `ultimate`
 
@@ -2092,7 +2092,7 @@ Whether or not ModSecurity has not been installed into the cluster
 
 Group: `group::container security`
 
-Status: `data_available`
+Status: `deprecated`
 
 Tiers: `free`, `premium`, `ultimate`
 
@@ -2104,7 +2104,7 @@ Cumulative count of packets identified as anomalous by ModSecurity since Usage P
 
 Group: `group::container security`
 
-Status: `data_available`
+Status: `deprecated`
 
 Tiers: `free`, `premium`, `ultimate`
 
@@ -2116,7 +2116,7 @@ Cumulative count of packets processed by ModSecurity since Usage Ping was last r
 
 Group: `group::container security`
 
-Status: `data_available`
+Status: `deprecated`
 
 Tiers: `free`, `premium`, `ultimate`
 
@@ -2128,7 +2128,7 @@ Whether or not ModSecurity statistics are unavailable
 
 Group: `group::container security`
 
-Status: `data_available`
+Status: `deprecated`
 
 Tiers: `ultimate`
 
@@ -6592,7 +6592,7 @@ Whether or not ModSecurity is enabled within Ingress
 
 Group: `group::container security`
 
-Status: `data_available`
+Status: `deprecated`
 
 Tiers: `free`, `premium`, `ultimate`
 

ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml

@@ -6,11 +6,10 @@ product_stage: protect
 product_group: group::container security
 product_category: web_firewall
 value_type: number
-status: data_available
+status: deprecated
 time_frame: all
 data_source: database
 distribution:
 - ee
 tier:
 - ultimate
-skip_validation: true

ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml

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