Adds gitlab features and components to usage ping data.
This commit is contained in:
parent
cfccb2785f
commit
25932308c0
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Adds gitlab features and components to usage ping data.
|
||||||
|
merge_request: 14305
|
||||||
|
author:
|
||||||
|
type: other
|
|
@ -9,12 +9,28 @@ module Gitlab
|
||||||
|
|
||||||
def uncached_data
|
def uncached_data
|
||||||
license_usage_data.merge(system_usage_data)
|
license_usage_data.merge(system_usage_data)
|
||||||
|
.merge(features_usage_data)
|
||||||
|
.merge(components_usage_data)
|
||||||
end
|
end
|
||||||
|
|
||||||
def to_json(force_refresh: false)
|
def to_json(force_refresh: false)
|
||||||
data(force_refresh: force_refresh).to_json
|
data(force_refresh: force_refresh).to_json
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def license_usage_data
|
||||||
|
usage_data = {
|
||||||
|
uuid: current_application_settings.uuid,
|
||||||
|
hostname: Gitlab.config.gitlab.host,
|
||||||
|
version: Gitlab::VERSION,
|
||||||
|
active_user_count: User.active.count,
|
||||||
|
recorded_at: Time.now,
|
||||||
|
mattermost_enabled: Gitlab.config.mattermost.enabled,
|
||||||
|
edition: 'CE'
|
||||||
|
}
|
||||||
|
|
||||||
|
usage_data
|
||||||
|
end
|
||||||
|
|
||||||
def system_usage_data
|
def system_usage_data
|
||||||
{
|
{
|
||||||
counts: {
|
counts: {
|
||||||
|
@ -54,18 +70,28 @@ module Gitlab
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
def license_usage_data
|
def features_usage_data
|
||||||
usage_data = {
|
features_usage_data_ce
|
||||||
uuid: current_application_settings.uuid,
|
end
|
||||||
hostname: Gitlab.config.gitlab.host,
|
|
||||||
version: Gitlab::VERSION,
|
|
||||||
active_user_count: User.active.count,
|
|
||||||
recorded_at: Time.now,
|
|
||||||
mattermost_enabled: Gitlab.config.mattermost.enabled,
|
|
||||||
edition: 'CE'
|
|
||||||
}
|
|
||||||
|
|
||||||
usage_data
|
def features_usage_data_ce
|
||||||
|
{
|
||||||
|
signup: current_application_settings.signup_enabled?,
|
||||||
|
ldap: Gitlab.config.ldap.enabled,
|
||||||
|
gravatar: current_application_settings.gravatar_enabled?,
|
||||||
|
omniauth: Gitlab.config.omniauth.enabled,
|
||||||
|
reply_by_email: Gitlab::IncomingEmail.enabled?,
|
||||||
|
container_registry: Gitlab.config.registry.enabled,
|
||||||
|
gitlab_shared_runners: Gitlab.config.gitlab_ci.shared_runners_enabled
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
def components_usage_data
|
||||||
|
{
|
||||||
|
gitlab_pages: { enabled: Gitlab.config.pages.enabled, version: Gitlab::Pages::VERSION },
|
||||||
|
git: { version: Gitlab::Git.version },
|
||||||
|
database: { adapter: Gitlab::Database.adapter_name, version: Gitlab::Database.version }
|
||||||
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
def services_usage
|
def services_usage
|
||||||
|
|
|
@ -26,6 +26,16 @@ describe Gitlab::UsageData do
|
||||||
version
|
version
|
||||||
uuid
|
uuid
|
||||||
hostname
|
hostname
|
||||||
|
signup
|
||||||
|
ldap
|
||||||
|
gravatar
|
||||||
|
omniauth
|
||||||
|
reply_by_email
|
||||||
|
container_registry
|
||||||
|
gitlab_pages
|
||||||
|
gitlab_shared_runners
|
||||||
|
git
|
||||||
|
database
|
||||||
))
|
))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -86,6 +96,32 @@ describe Gitlab::UsageData do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe '#features_usage_data_ce' do
|
||||||
|
subject { described_class.features_usage_data_ce }
|
||||||
|
|
||||||
|
it 'gathers feature usage data' do
|
||||||
|
expect(subject[:signup]).to eq(current_application_settings.signup_enabled?)
|
||||||
|
expect(subject[:ldap]).to eq(Gitlab.config.ldap.enabled)
|
||||||
|
expect(subject[:gravatar]).to eq(current_application_settings.gravatar_enabled?)
|
||||||
|
expect(subject[:omniauth]).to eq(Gitlab.config.omniauth.enabled)
|
||||||
|
expect(subject[:reply_by_email]).to eq(Gitlab::IncomingEmail.enabled?)
|
||||||
|
expect(subject[:container_registry]).to eq(Gitlab.config.registry.enabled)
|
||||||
|
expect(subject[:gitlab_shared_runners]).to eq(Gitlab.config.gitlab_ci.shared_runners_enabled)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe '#components_usage_data' do
|
||||||
|
subject { described_class.components_usage_data }
|
||||||
|
|
||||||
|
it 'gathers components usage data' do
|
||||||
|
expect(subject[:gitlab_pages][:enabled]).to eq(Gitlab.config.pages.enabled)
|
||||||
|
expect(subject[:gitlab_pages][:version]).to eq(Gitlab::Pages::VERSION)
|
||||||
|
expect(subject[:git][:version]).to eq(Gitlab::Git.version)
|
||||||
|
expect(subject[:database][:adapter]).to eq(Gitlab::Database.adapter_name)
|
||||||
|
expect(subject[:database][:version]).to eq(Gitlab::Database.version)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe '#license_usage_data' do
|
describe '#license_usage_data' do
|
||||||
subject { described_class.license_usage_data }
|
subject { described_class.license_usage_data }
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue