Skip to content
Snippets Groups Projects
Commit 9f76632d authored by Balasankar C's avatar Balasankar C Committed by Sean McGivern
Browse files

Add installation type to usage ping data

parent 75ee50f8
No related branches found
No related tags found
No related merge requests found
source
Loading
Loading
@@ -33,6 +33,7 @@ module Gitlab
APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}
VERSION = File.read(root.join("VERSION")).strip.freeze
INSTALLATION_TYPE = File.read(root.join("INSTALLATION_TYPE")).strip.freeze
 
def self.com?
# Check `gl_subdomain?` as well to keep parity with gitlab.com
Loading
Loading
Loading
Loading
@@ -21,6 +21,7 @@ module Gitlab
uuid: Gitlab::CurrentSettings.uuid,
hostname: Gitlab.config.gitlab.host,
version: Gitlab::VERSION,
installation_type: Gitlab::INSTALLATION_TYPE,
active_user_count: User.active.count,
recorded_at: Time.now,
mattermost_enabled: Gitlab.config.mattermost.enabled,
Loading
Loading
Loading
Loading
@@ -32,6 +32,7 @@ describe Gitlab::UsageData do
mattermost_enabled
edition
version
installation_type
uuid
hostname
signup
Loading
Loading
@@ -156,6 +157,7 @@ describe Gitlab::UsageData do
it "gathers license data" do
expect(subject[:uuid]).to eq(Gitlab::CurrentSettings.uuid)
expect(subject[:version]).to eq(Gitlab::VERSION)
expect(subject[:installation_type]).to eq(Gitlab::INSTALLATION_TYPE)
expect(subject[:active_user_count]).to eq(User.active.count)
expect(subject[:recorded_at]).to be_a(Time)
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment