diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-04-16 10:05:30 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2019-04-16 10:05:30 +0000 |
| commit | fcd09b77bcb1e12f8649841a84853a4080d72950 (patch) | |
| tree | b5aaf605e3e8b4c52d4fd2eef83f96987037e11a | |
| parent | fae9fefe2f21497e210b09a38ff7f78de8d9bac1 (diff) | |
| parent | 64b04fb0750ede777a55c01e3c8554f799cfe66f (diff) | |
| download | gitlab-ce-fcd09b77bcb1e12f8649841a84853a4080d72950.tar.gz | |
Merge branch '53138-add-metrics-usage-ping' into 'master'
Adds instance metrics to usage ping
Closes #53138
See merge request gitlab-org/gitlab-ce!27238
| -rw-r--r-- | changelogs/unreleased/53138-add-metrics-usage-ping.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/usage_data.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/usage_data_spec.rb | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/changelogs/unreleased/53138-add-metrics-usage-ping.yml b/changelogs/unreleased/53138-add-metrics-usage-ping.yml new file mode 100644 index 00000000000..db6af77a647 --- /dev/null +++ b/changelogs/unreleased/53138-add-metrics-usage-ping.yml @@ -0,0 +1,5 @@ +--- +title: Adds if InfluxDB and Prometheus metrics are enabled to usage ping data +merge_request: 27238 +author: +type: added diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index 75477c7cf18..08156d7ffa6 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::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::Metrics.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 |