diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-03-25 07:42:09 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-03-25 07:42:09 +0000 |
commit | 5c6477fb4c9c8e324c228e39cb6a6cbb2a8bc2a0 (patch) | |
tree | e0a17ed0eb3f0a821b03b17d32b84bcaaa81d8cf | |
parent | 66115fee28faece4290b0649c3284fd14384a4b2 (diff) | |
parent | 0cd7ebf717970f9db9298e49959bbbc78bc17342 (diff) | |
download | gitlab-ce-5c6477fb4c9c8e324c228e39cb6a6cbb2a8bc2a0.tar.gz |
Merge branch 'ce-56153-error-tracking-counts' into 'master'
Add error tracking usage counts
See merge request gitlab-org/gitlab-ce!25472
-rw-r--r-- | changelogs/unreleased/ce-56153-error-tracking-counts.yml | 5 | ||||
-rw-r--r-- | lib/gitlab/usage_data.rb | 1 | ||||
-rw-r--r-- | spec/lib/gitlab/usage_data_spec.rb | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/changelogs/unreleased/ce-56153-error-tracking-counts.yml b/changelogs/unreleased/ce-56153-error-tracking-counts.yml new file mode 100644 index 00000000000..fc3d8c01d7f --- /dev/null +++ b/changelogs/unreleased/ce-56153-error-tracking-counts.yml @@ -0,0 +1,5 @@ +--- +title: Add usage counts for error tracking feature +merge_request: 25472 +author: +type: added diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index f9c9ea4f936..75477c7cf18 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -84,6 +84,7 @@ module Gitlab projects: count(Project), projects_imported_from_github: count(Project.where(import_type: 'github')), projects_with_repositories_enabled: count(ProjectFeature.where('repository_access_level > ?', ProjectFeature::DISABLED)), + projects_with_error_tracking_enabled: count(::ErrorTracking::ProjectErrorTrackingSetting.where(enabled: true)), protected_branches: count(ProtectedBranch), releases: count(Release), remote_mirrors: count(RemoteMirror), diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index cd9e4d48cd1..549cc5ac057 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -13,6 +13,8 @@ describe Gitlab::UsageData do create(:service, project: projects[0], type: 'SlackSlashCommandsService', active: true) create(:service, project: projects[1], type: 'SlackService', active: true) create(:service, project: projects[2], type: 'SlackService', active: true) + create(:project_error_tracking_setting, project: projects[0]) + create(:project_error_tracking_setting, project: projects[1], enabled: false) gcp_cluster = create(:cluster, :provided_by_gcp) create(:cluster, :provided_by_user) @@ -117,6 +119,7 @@ describe Gitlab::UsageData do projects_slack_slash_active projects_prometheus_active projects_with_repositories_enabled + projects_with_error_tracking_enabled pages_domains protected_branches releases @@ -146,6 +149,7 @@ describe Gitlab::UsageData do expect(count_data[:projects_slack_notifications_active]).to eq(2) expect(count_data[:projects_slack_slash_active]).to eq(1) expect(count_data[:projects_with_repositories_enabled]).to eq(2) + expect(count_data[:projects_with_error_tracking_enabled]).to eq(1) expect(count_data[:clusters_enabled]).to eq(7) expect(count_data[:project_clusters_enabled]).to eq(6) |