summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-05-09 20:58:22 +0100
committerSean McGivern <sean@gitlab.com>2017-05-11 09:20:12 +0100
commitd2d6435372bd9a68ce1bad1dfe24f34d0924e048 (patch)
tree2f4c81114c16d2a798b8bf1a16a5f0b5316a7780
parent3c546acf78408087b5062be67ae6b05650e0f27e (diff)
downloadgitlab-ce-d2d6435372bd9a68ce1bad1dfe24f34d0924e048.tar.gz
Add hostname to usage ping
-rw-r--r--changelogs/unreleased/disable-usage-ping-2.yml4
-rw-r--r--lib/gitlab/usage_data.rb1
-rw-r--r--spec/lib/gitlab/usage_data_spec.rb1
3 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/unreleased/disable-usage-ping-2.yml b/changelogs/unreleased/disable-usage-ping-2.yml
new file mode 100644
index 00000000000..4abd325f120
--- /dev/null
+++ b/changelogs/unreleased/disable-usage-ping-2.yml
@@ -0,0 +1,4 @@
+---
+title: Add hostname to usage ping
+merge_request:
+author:
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 14d8e925d0e..4382cf7b12f 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -52,6 +52,7 @@ module Gitlab
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,
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 9046d5c413f..2c46920456b 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -17,6 +17,7 @@ describe Gitlab::UsageData do
edition
version
uuid
+ hostname
))
end