diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-05-19 13:49:15 +0300 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-02 20:45:57 +0300 |
| commit | c28546177e2b4d5f7f3cc0e5b3a7b404206565fb (patch) | |
| tree | 3f539df45149ac841c4f7823653227a6ca78b186 /lib/gitlab/metrics.rb | |
| parent | 6b9a091ceeb1c760be14f749956807bc429af46d (diff) | |
Prometheus settings
Diffstat (limited to 'lib/gitlab/metrics.rb')
| -rw-r--r-- | lib/gitlab/metrics.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/gitlab/metrics.rb b/lib/gitlab/metrics.rb index e784ca785f0..6f50c0aa028 100644 --- a/lib/gitlab/metrics.rb +++ b/lib/gitlab/metrics.rb @@ -10,15 +10,15 @@ module Gitlab def self.settings @settings ||= { - enabled: current_application_settings[:metrics_enabled], - prometheus_metrics_enabled: true, - pool_size: current_application_settings[:metrics_pool_size], - timeout: current_application_settings[:metrics_timeout], - method_call_threshold: current_application_settings[:metrics_method_call_threshold], - host: current_application_settings[:metrics_host], - port: current_application_settings[:metrics_port], - sample_interval: current_application_settings[:metrics_sample_interval] || 15, - packet_size: current_application_settings[:metrics_packet_size] || 1 + enabled: current_application_settings[:metrics_enabled], + prometheus_metrics_enabled: current_application_settings[:prometheus_metrics_enabled], + pool_size: current_application_settings[:metrics_pool_size], + timeout: current_application_settings[:metrics_timeout], + method_call_threshold: current_application_settings[:metrics_method_call_threshold], + host: current_application_settings[:metrics_host], + port: current_application_settings[:metrics_port], + sample_interval: current_application_settings[:metrics_sample_interval] || 15, + packet_size: current_application_settings[:metrics_packet_size] || 1 } end @@ -31,7 +31,7 @@ module Gitlab end def self.enabled? - influx_metrics_enabled? || prometheus_metrics_enabled? || false + influx_metrics_enabled? || prometheus_metrics_enabled? end def self.mri? |