Commit b9eedab1 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Add count of projects with at least one package to a usage ping data

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 6b2e23a5
---
title: Add count of projects with at least one package to a usage ping data
merge_request: 8641
author:
type: other
...@@ -100,7 +100,8 @@ module EE ...@@ -100,7 +100,8 @@ module EE
ldap_users: count(::User.ldap), ldap_users: count(::User.ldap),
projects_reporting_ci_cd_back_to_github: count(::GithubService.without_defaults.active), projects_reporting_ci_cd_back_to_github: count(::GithubService.without_defaults.active),
projects_mirrored_with_pipelines_enabled: projects_mirrored_with_pipelines_enabled, projects_mirrored_with_pipelines_enabled: projects_mirrored_with_pipelines_enabled,
projects_with_prometheus_alerts: count(PrometheusAlert.distinct_projects) projects_with_prometheus_alerts: count(PrometheusAlert.distinct_projects),
projects_with_packages: count(::Packages::Package.select('distinct project_id'))
}).merge(service_desk_counts).merge(security_products_usage) }).merge(service_desk_counts).merge(security_products_usage)
usage_data usage_data
......
...@@ -18,6 +18,10 @@ describe Gitlab::UsageData do ...@@ -18,6 +18,10 @@ describe Gitlab::UsageData do
create(:prometheus_alert, project: projects[0]) create(:prometheus_alert, project: projects[0])
create(:prometheus_alert, project: projects[0]) create(:prometheus_alert, project: projects[0])
create(:prometheus_alert, project: projects[1]) create(:prometheus_alert, project: projects[1])
create(:package, project: projects[0])
create(:package, project: projects[0])
create(:package, project: projects[1])
end end
subject { described_class.data } subject { described_class.data }
...@@ -59,9 +63,11 @@ describe Gitlab::UsageData do ...@@ -59,9 +63,11 @@ describe Gitlab::UsageData do
license_management_jobs license_management_jobs
sast_jobs sast_jobs
projects_with_prometheus_alerts projects_with_prometheus_alerts
projects_with_packages
)) ))
expect(count_data[:projects_with_prometheus_alerts]).to eq(2) expect(count_data[:projects_with_prometheus_alerts]).to eq(2)
expect(count_data[:projects_with_packages]).to eq(2)
end end
it 'gathers security products usage data' do it 'gathers security products usage data' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment