diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 12:06:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-13 12:06:22 +0000 |
commit | 4e516dbff9767a35677fdc4a6e39005b4b564376 (patch) | |
tree | 7c650b30777b8e7f72cafb186e9446a50d3fa3be /lib/gitlab/usage_data.rb | |
parent | 4f01ac5ba0bf72427ed4fef9b229d056dbb60e89 (diff) | |
download | gitlab-ce-4e516dbff9767a35677fdc4a6e39005b4b564376.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/usage_data.rb')
-rw-r--r-- | lib/gitlab/usage_data.rb | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 5dbdc8b2cdd..10a86d13aa7 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -13,7 +13,8 @@ module Gitlab end def uncached_data - license_usage_data.merge(system_usage_data) + license_usage_data + .merge(system_usage_data) .merge(features_usage_data) .merge(components_usage_data) .merge(cycle_analytics_usage_data) @@ -170,10 +171,13 @@ module Gitlab types = { SlackService: :projects_slack_notifications_active, SlackSlashCommandsService: :projects_slack_slash_active, - PrometheusService: :projects_prometheus_active + PrometheusService: :projects_prometheus_active, + CustomIssueTrackerService: :projects_custom_issue_tracker_active, + JenkinsService: :projects_jenkins_active, + MattermostService: :projects_mattermost_active } - results = count(Service.unscoped.where(type: types.keys, active: true).group(:type), fallback: Hash.new(-1)) + results = count(Service.active.by_type(types.keys).group(:type), fallback: Hash.new(-1)) types.each_with_object({}) { |(klass, key), response| response[key] = results[klass.to_s] || 0 } .merge(jira_usage) end @@ -188,8 +192,8 @@ module Gitlab projects_jira_active: -1 } - Service.unscoped - .where(type: :JiraService, active: true) + Service.active + .by_type(:JiraService) .includes(:jira_tracker_data) .find_in_batches(batch_size: BATCH_SIZE) do |services| |