From bb225b66758b861d3e8243d130635a6ea65c7d41 Mon Sep 17 00:00:00 2001 From: Ryan Cobb Date: Wed, 10 Apr 2019 11:22:05 -0600 Subject: Adds instance metrics to usage ping This adds influxdb_metrics_enabled and prometheus_metrics_enabled to usage ping. --- lib/gitlab/usage_data.rb | 2 ++ spec/lib/gitlab/usage_data_spec.rb | 2 ++ 2 files changed, 4 insertions(+) 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 -- cgit v1.2.1