diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-01 12:07:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-01 12:07:45 +0300 |
commit | b11f7057d067885619ee3e513751f180b2e8ad85 (patch) | |
tree | dfb3077ea8716ed217f5ce4324be4e25a450c599 /lib/gitlab/usage_data.rb | |
parent | e50050a8756a20b6aa118edbad3369674e4c63ba (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/usage_data.rb')
-rw-r--r-- | lib/gitlab/usage_data.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index c131566380e..733cafd9d6c 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -174,10 +174,19 @@ module Gitlab git: { version: Gitlab::Git.version }, gitaly: { version: Gitaly::Server.all.first.server_version, servers: Gitaly::Server.count, filesystems: Gitaly::Server.filesystems }, gitlab_pages: { enabled: Gitlab.config.pages.enabled, version: Gitlab::Pages::VERSION }, - database: { adapter: Gitlab::Database.adapter_name, version: Gitlab::Database.version } + database: { adapter: Gitlab::Database.adapter_name, version: Gitlab::Database.version }, + app_server: { type: app_server_type } } end + def app_server_type + Gitlab::Runtime.identify.to_s + rescue Gitlab::Runtime::IdentificationError => e + Gitlab::AppLogger.error(e.message) + Gitlab::ErrorTracking.track_exception(e) + 'unknown_app_server_type' + end + def ingress_modsecurity_usage ::Clusters::Applications::IngressModsecurityUsageService.new.execute end |