Remove ci related metrics from usage_activity_by_stage_secure from usage_data.rb
Instrumentation classes were added with #339447 (closed)
We can remove the code from usage_data.rb
prefix = 'user_'
results = {
user_preferences_group_overview_security_dashboard: count(::User.active.group_view_security_dashboard.where(time_period))
}
time_frame = metric_time_period(time_period)
SECURE_PRODUCT_TYPES.each do |secure_type, attribs|
results["#{prefix}#{attribs[:name]}".to_sym] = add_metric('CountUsersCreatingCiBuildsMetric', time_frame: time_frame, options: { secure_type: secure_type })
end
results.merge!(count_secure_pipelines(time_period))
results.merge!(count_secure_scans(time_period))
results[:"#{prefix}unique_users_all_secure_scanners"] = distinct_count(::Ci::Build.where(name: SECURE_PRODUCT_TYPES.keys).where(time_period), :user_id)
# handle license rename https://gitlab.com/gitlab-org/gitlab/issues/8911
combined_license_key = "#{prefix}license_management_jobs".to_sym
license_scan_count = results.delete("#{prefix}license_scanning_jobs".to_sym)
results[combined_license_key] += license_scan_count > 0 ? license_scan_count : 0 if license_scan_count.is_a?(Integer)
super.merge(results)
Metrics generated with this method
Note that we have for all time and for recent 28 days
Gitlab::UsageData.usage_activity_by_stage_secure({})=>
{:user_preferences_group_overview_security_dashboard=>0,
:user_container_scanning_jobs=>0,
:user_dast_jobs=>0,
:user_dependency_scanning_jobs=>0,
:user_license_management_jobs=>0,
:user_sast_jobs=>0,
:user_secret_detection_jobs=>0,
:user_coverage_fuzzing_jobs=>0,
:user_api_fuzzing_jobs=>0,
:user_api_fuzzing_dnd_jobs=>0,
:sast_scans=>0,
:dependency_scanning_scans=>0,
:container_scanning_scans=>0,
:dast_scans=>0,
:secret_detection_scans=>0,
:coverage_fuzzing_scans=>0,
:api_fuzzing_scans=>0,
:cluster_image_scanning_scans=>0,
:user_unique_users_all_secure_scanners=>0}
Edited by Alina Mihaila