summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-07-24 13:09:49 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-07-24 13:09:49 +0000
commite5b9bcff21bce0a70cb7d20edaedb21a3975b3b1 (patch)
tree8f5359834f3fd30a2daffb5b1a9c5e88ca50887e /lib
parent6d13bc5863ca4ac6c06ba544e3d13e722984a65e (diff)
parent124ef7dd60f481ccbc8217571e1790f9fc56abe9 (diff)
downloadgitlab-ce-e5b9bcff21bce0a70cb7d20edaedb21a3975b3b1.tar.gz
Merge branch '31533-usage-data-projects-stats' into 'master'
Add Slack and JIRA services counts to Usage Data Closes #31533 See merge request !12974
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/usage_data.rb15
1 files changed, 13 insertions, 2 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index dba071d7e47..e0ac21305a5 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -40,14 +40,13 @@ module Gitlab
pages_domains: PagesDomain.count,
projects: Project.count,
projects_imported_from_github: Project.where(import_type: 'github').count,
- projects_prometheus_active: PrometheusService.active.count,
protected_branches: ProtectedBranch.count,
releases: Release.count,
snippets: Snippet.count,
todos: Todo.count,
uploads: Upload.count,
web_hooks: WebHook.count
- }
+ }.merge(services_usage)
}
end
@@ -64,6 +63,18 @@ module Gitlab
usage_data
end
+
+ def services_usage
+ types = {
+ JiraService: :projects_jira_active,
+ SlackService: :projects_slack_notifications_active,
+ SlackSlashCommandsService: :projects_slack_slash_active,
+ PrometheusService: :projects_prometheus_active
+ }
+
+ results = Service.unscoped.where(type: types.keys, active: true).group(:type).count
+ results.each_with_object({}) { |(key, value), response| response[types[key.to_sym]] = value }
+ end
end
end
end