diff options
| author | Ryan Cobb <ryan.david.cobb@gmail.com> | 2019-04-10 11:22:05 -0600 |
|---|---|---|
| committer | Ryan Cobb <ryan.david.cobb@gmail.com> | 2019-04-10 11:22:05 -0600 |
| commit | bb225b66758b861d3e8243d130635a6ea65c7d41 (patch) | |
| tree | 222bc88007375e27141a953740073a64829182b5 | |
| parent | ddab30ad3561c6834fd779458ce89084c8a95ca5 (diff) | |
| download | gitlab-ce-bb225b66758b861d3e8243d130635a6ea65c7d41.tar.gz | |
Adds instance metrics to usage ping
This adds influxdb_metrics_enabled and prometheus_metrics_enabled to
usage ping.
| -rw-r--r-- | lib/gitlab/usage_data.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/usage_data_spec.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 75477c7cf18..95ab8f2c0f6 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -117,9 +117,11 @@ module Gitlab container_registry_enabled: Gitlab.config.registry.enabled, gitlab_shared_runners_enabled: Gitlab.config.gitlab_ci.shared_runners_enabled, gravatar_enabled: Gitlab::CurrentSettings.gravatar_enabled?, + influxdb_metrics_enabled: Gitlab::CurrentSettings.metrics_enabled?, ldap_enabled: Gitlab.config.ldap.enabled, mattermost_enabled: Gitlab.config.mattermost.enabled, omniauth_enabled: Gitlab::Auth.omniauth_enabled?, + prometheus_metrics_enabled: Gitlab::CurrentSettings.prometheus_metrics_enabled?, reply_by_email_enabled: Gitlab::IncomingEmail.enabled?, signup_enabled: Gitlab::CurrentSettings.allow_signup? } diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb index 549cc5ac057..4e910e67ac2 100644 --- a/spec/lib/gitlab/usage_data_spec.rb +++ b/spec/lib/gitlab/usage_data_spec.rb @@ -57,6 +57,8 @@ describe Gitlab::UsageData do database avg_cycle_analytics web_ide_commits + influxdb_metrics_enabled + prometheus_metrics_enabled )) end |