diff --git a/changelogs/unreleased/ldap-encrypted-usage-data.yml b/changelogs/unreleased/ldap-encrypted-usage-data.yml new file mode 100644 index 0000000000000000000000000000000000000000..4cb716167d00fd85fcf3a868491d911d9ebdacfc --- /dev/null +++ b/changelogs/unreleased/ldap-encrypted-usage-data.yml @@ -0,0 +1,5 @@ +--- +title: Add ldap encrypted credentials to the usage data +merge_request: 48210 +author: +type: changed diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 7cfe500260a4b30eb677d4e725130c13e1cc4d05..9179efb95824e45bf8798acd9c8d67f9874002df 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -236,7 +236,9 @@ def system_usage_data_license def system_usage_data_settings { - settings: {} + settings: { + ldap_encrypted_secrets_enabled: alt_usage_data(fallback: nil) { Gitlab::Auth::Ldap::Config.encrypted_secrets.active? } + } } end diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index a67a6f02aef1bf9e694b2b8a517601f96263b86f..7efb2c85386223cff144e07f3d2d8e184ddcb280 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -1038,6 +1038,14 @@ def omniauth_providers end end end + + describe ".system_usage_data_settings" do + subject { described_class.system_usage_data_settings } + + it 'gathers settings usage data', :aggregate_failures do + expect(subject[:settings][:ldap_encrypted_secrets_enabled]).to eq(Gitlab::Auth::Ldap::Config.encrypted_secrets.active?) + end + end end describe '.merge_requests_users', :clean_gitlab_redis_shared_state do