summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Cobb <ryan.david.cobb@gmail.com>2019-04-11 11:34:37 -0600
committerRyan Cobb <ryan.david.cobb@gmail.com>2019-04-11 11:34:37 -0600
commit64b04fb0750ede777a55c01e3c8554f799cfe66f (patch)
treedeac4e64aec0c0759a20471be9ad37b3f068a2b7
parentde6539906f3a8f2850615a402fbb548979caf250 (diff)
downloadgitlab-ce-53138-add-metrics-usage-ping.tar.gz
Use Gitlab::Metrics methods for checking if metrics are enabled53138-add-metrics-usage-ping
-rw-r--r--lib/gitlab/usage_data.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 95ab8f2c0f6..08156d7ffa6 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -117,11 +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?,
+ influxdb_metrics_enabled: Gitlab::Metrics.influx_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?,
+ prometheus_metrics_enabled: Gitlab::Metrics.prometheus_metrics_enabled?,
reply_by_email_enabled: Gitlab::IncomingEmail.enabled?,
signup_enabled: Gitlab::CurrentSettings.allow_signup?
}