Commit fcd09b77 authored by Grzegorz Bizon's avatar Grzegorz Bizon

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
parents fae9fefe 64b04fb0
---
title: Adds if InfluxDB and Prometheus metrics are enabled to usage ping data
merge_request: 27238
author:
type: added
...@@ -117,9 +117,11 @@ module Gitlab ...@@ -117,9 +117,11 @@ module Gitlab
container_registry_enabled: Gitlab.config.registry.enabled, container_registry_enabled: Gitlab.config.registry.enabled,
gitlab_shared_runners_enabled: Gitlab.config.gitlab_ci.shared_runners_enabled, gitlab_shared_runners_enabled: Gitlab.config.gitlab_ci.shared_runners_enabled,
gravatar_enabled: Gitlab::CurrentSettings.gravatar_enabled?, gravatar_enabled: Gitlab::CurrentSettings.gravatar_enabled?,
influxdb_metrics_enabled: Gitlab::Metrics.influx_metrics_enabled?,
ldap_enabled: Gitlab.config.ldap.enabled, ldap_enabled: Gitlab.config.ldap.enabled,
mattermost_enabled: Gitlab.config.mattermost.enabled, mattermost_enabled: Gitlab.config.mattermost.enabled,
omniauth_enabled: Gitlab::Auth.omniauth_enabled?, omniauth_enabled: Gitlab::Auth.omniauth_enabled?,
prometheus_metrics_enabled: Gitlab::Metrics.prometheus_metrics_enabled?,
reply_by_email_enabled: Gitlab::IncomingEmail.enabled?, reply_by_email_enabled: Gitlab::IncomingEmail.enabled?,
signup_enabled: Gitlab::CurrentSettings.allow_signup? signup_enabled: Gitlab::CurrentSettings.allow_signup?
} }
......
...@@ -57,6 +57,8 @@ describe Gitlab::UsageData do ...@@ -57,6 +57,8 @@ describe Gitlab::UsageData do
database database
avg_cycle_analytics avg_cycle_analytics
web_ide_commits web_ide_commits
influxdb_metrics_enabled
prometheus_metrics_enabled
)) ))
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment