summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-04-06 20:52:08 +0100
committerRémy Coutable <remy@rymai.me>2017-04-14 15:20:55 +0200
commitb61199ce0ccdfcd11a338778ce300cd15e5f2a43 (patch)
tree66cba5fddfdd840b5feaeaeaac3cae31fab872ee
parent092258e92490f177c6262287d1eca4e33e908614 (diff)
downloadgitlab-ce-b61199ce0ccdfcd11a338778ce300cd15e5f2a43.tar.gz
Add prometheus services to usage ping
-rw-r--r--doc/user/admin_area/settings/usage_statistics.md3
-rw-r--r--lib/gitlab/usage_data.rb1
-rw-r--r--spec/lib/gitlab/usage_data_spec.rb1
3 files changed, 4 insertions, 1 deletions
diff --git a/doc/user/admin_area/settings/usage_statistics.md b/doc/user/admin_area/settings/usage_statistics.md
index 4ad4a174640..6c9352332c2 100644
--- a/doc/user/admin_area/settings/usage_statistics.md
+++ b/doc/user/admin_area/settings/usage_statistics.md
@@ -62,6 +62,7 @@ The total number of the following is sent back to GitLab Inc.:
- Deploy keys
- Pages
- Project Services
+- Projects using the Prometheus service
- Issue Boards
- CI Runners
- Deployments
@@ -75,7 +76,7 @@ The total number of the following is sent back to GitLab Inc.:
- Remote mirrors
- Web hooks
-Also, we track if you've installed Mattermost with GitLab.
+Also, we track if you've installed Mattermost with GitLab.
For example: `"mattermost_enabled":true"`.
## Privacy policy
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 008c3d994db..6aca6db3123 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -36,6 +36,7 @@ module Gitlab
notes: Note.count,
pages_domains: PagesDomain.count,
projects: Project.count,
+ projects_prometheus_active: PrometheusService.active.count,
protected_branches: ProtectedBranch.count,
releases: Release.count,
services: Service.where(active: true).count,
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 7ae26081022..7f21288cf88 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -44,6 +44,7 @@ describe Gitlab::UsageData do
milestones
notes
projects
+ projects_prometheus_active
pages_domains
protected_branches
releases