Commit d3846406 authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch '213115-add-number-of-project-compliance-frameworks-to-usage-ping' into 'master'

Add number of projects with compliance framework to usage ping

Closes #213115

See merge request gitlab-org/gitlab!31923
parents 9af9b2e2 ab4950ab
---
title: Add number of projects with compliance framework to usage ping
merge_request: 31923
author:
type: added
...@@ -272,7 +272,8 @@ module EE ...@@ -272,7 +272,8 @@ module EE
ldap_keys: distinct_count(::LDAPKey.where(time_period), :user_id), ldap_keys: distinct_count(::LDAPKey.where(time_period), :user_id),
ldap_users: distinct_count(::GroupMember.of_ldap_type.where(time_period), :user_id), ldap_users: distinct_count(::GroupMember.of_ldap_type.where(time_period), :user_id),
users_created: count(::User.where(time_period)), users_created: count(::User.where(time_period)),
value_stream_management_customized_group_stages: count(::Analytics::CycleAnalytics::GroupStage.where(custom: true)) value_stream_management_customized_group_stages: count(::Analytics::CycleAnalytics::GroupStage.where(custom: true)),
projects_with_compliance_framework: count(::ComplianceManagement::ComplianceFramework::ProjectSettings)
} }
end end
......
...@@ -419,6 +419,7 @@ describe Gitlab::UsageData do ...@@ -419,6 +419,7 @@ describe Gitlab::UsageData do
create(:key, type: 'LDAPKey', user: user) create(:key, type: 'LDAPKey', user: user)
create(:group_member, ldap: true, user: user) create(:group_member, ldap: true, user: user)
create(:cycle_analytics_group_stage) create(:cycle_analytics_group_stage)
create(:compliance_framework_project_setting)
end end
expect(described_class.uncached_data[:usage_activity_by_stage][:manage]).to eq( expect(described_class.uncached_data[:usage_activity_by_stage][:manage]).to eq(
...@@ -426,16 +427,18 @@ describe Gitlab::UsageData do ...@@ -426,16 +427,18 @@ describe Gitlab::UsageData do
groups: 2, groups: 2,
ldap_keys: 2, ldap_keys: 2,
ldap_users: 2, ldap_users: 2,
users_created: 6, users_created: 8,
value_stream_management_customized_group_stages: 2 value_stream_management_customized_group_stages: 2,
projects_with_compliance_framework: 2
) )
expect(described_class.uncached_data[:usage_activity_by_stage_monthly][:manage]).to eq( expect(described_class.uncached_data[:usage_activity_by_stage_monthly][:manage]).to eq(
events: 1, events: 1,
groups: 1, groups: 1,
ldap_keys: 1, ldap_keys: 1,
ldap_users: 1, ldap_users: 1,
users_created: 4, users_created: 5,
value_stream_management_customized_group_stages: 2 value_stream_management_customized_group_stages: 2,
projects_with_compliance_framework: 2
) )
end end
end end
......
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