Merge branch '340847-remove-deprecated-metric-status-4' into 'master'

Remove deprecated Secure metrics

See merge request gitlab-org/gitlab!76705

ee/config/metrics/counts_28d/20210607041718_user_dast_scans.yml

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::dynamic analysis
 product_category: dynamic_application_security_testing
 value_type: number
-status: deprecated
+status: removed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: 28d
 data_source: database

ee/config/metrics/counts_28d/20210607043218_user_sast_scans.yml

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::static analysis
 product_category: static_application_security_testing
 value_type: number
-status: deprecated
+status: removed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: 28d
 data_source: database

ee/config/metrics/counts_28d/20210607043301_user_dependency_scanning_scans.yml

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::composition analysis
 product_category: dependency_scanning
 value_type: number
-status: deprecated
+status: removed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: 28d
 data_source: database

ee/config/metrics/counts_28d/20210607043336_user_container_scanning_scans.yml

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::composition analysis
 product_category: container_scanning
 value_type: number
-status: deprecated
+status: removed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: 28d
 data_source: database

ee/config/metrics/counts_28d/20210607043410_user_secret_detection_scans.yml

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::static analysis
 product_category: secret_detection
 value_type: number
-status: deprecated
+status: removed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: 28d
 data_source: database

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

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::dynamic analysis
 product_category: fuzz-testing
 value_type: number
-status: deprecated
+status: removed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: 28d
 data_source: database

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

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::dynamic analysis
 product_category: fuzz-testing
 value_type: number
-status: deprecated
+status: removed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: 28d
 data_source: database

ee/config/metrics/counts_28d/20210810034303_user_cluster_image_scanning_scans.yml

@@ -5,7 +5,7 @@ product_section: sec
 product_stage: protect
 product_group: group::container security
 value_type: number
-status: deprecated
+status: removed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: 28d
 data_source: database

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

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::dynamic analysis
 product_category: dynamic_application_security_testing
 value_type: number
-status: deprecated
+status: removed
 data_category: optional
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: all

ee/config/metrics/counts_all/20210607043741_user_sast_scans.yml

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::static analysis
 product_category: static_application_security_testing
 value_type: number
-status: deprecated
+status: removed
 data_category: optional
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: all

ee/config/metrics/counts_all/20210607043819_user_dependency_scanning_scans.yml

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::composition analysis
 product_category: dependency_scanning
 value_type: number
-status: deprecated
+status: removed
 data_category: optional
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: all

ee/config/metrics/counts_all/20210607043902_user_container_scanning_scans.yml

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::composition analysis
 product_category: container_scanning
 value_type: number
-status: deprecated
+status: removed
 data_category: optional
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: all

ee/config/metrics/counts_all/20210607043957_user_secret_detection_scans.yml

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::static analysis
 product_category: secret_detection
 value_type: number
-status: deprecated
+status: removed
 data_category: optional
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: all

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

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::dynamic analysis
 product_category: fuzz-testing
 value_type: number
-status: deprecated
+status: removed
 data_category: optional
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: all

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

@@ -6,7 +6,7 @@ product_stage: secure
 product_group: group::dynamic analysis
 product_category: fuzz-testing
 value_type: number
-status: deprecated
+status: removed
 data_category: optional
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: all

ee/config/metrics/counts_all/20210810033334_user_cluster_image_scanning_scans.yml

@@ -5,7 +5,7 @@ product_section: sec
 product_stage: protect
 product_group: group::container security
 value_type: number
-status: deprecated
+status: removed
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49444
 time_frame: all
 data_source: database

ee/lib/ee/gitlab/usage_data.rb

@@ -391,7 +391,6 @@ module EE
               end
           end
 
-          results.merge!(count_secure_user_scans)
           results.merge!(count_secure_pipelines(time_period))
           results.merge!(count_secure_scans(time_period))
 
@@ -408,12 +407,6 @@ module EE
 
         private
 
-        # rubocop:disable UsageData/LargeTable
-        def count_secure_user_scans
-          ::Security::Scan.scan_types.to_h { |name, _| ["user_#{name}_scans".to_sym, ::Gitlab::UsageData::DEPRECATED_VALUE] }
-        end
-        # rubocop:enable UsageData/LargeTable
-
         # rubocop:disable CodeReuse/ActiveRecord
         # rubocop: disable UsageData/LargeTable
         def count_secure_scans(time_period)

ee/spec/lib/ee/gitlab/usage_data_spec.rb

@@ -768,18 +768,6 @@ RSpec.describe Gitlab::UsageData do
         end
       end
     end
-
-    it 'deprecates count for users who have run scans' do
-      expect(described_class.usage_activity_by_stage_secure(described_class.monthly_time_range_db_params)).to include(
-        user_api_fuzzing_scans: described_class::DEPRECATED_VALUE,
-        user_container_scanning_scans: described_class::DEPRECATED_VALUE,
-        user_coverage_fuzzing_scans: described_class::DEPRECATED_VALUE,
-        user_dast_scans: described_class::DEPRECATED_VALUE,
-        user_dependency_scanning_scans: described_class::DEPRECATED_VALUE,
-        user_sast_scans: described_class::DEPRECATED_VALUE,
-        user_secret_detection_scans: described_class::DEPRECATED_VALUE
-      )
-    end
   end
 
   describe 'usage_activity_by_stage_verify' do