diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-08-07 17:08:05 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-08-07 17:08:05 +0200 |
| commit | d08193f1a7a81b3acd70446b041b40410395c025 (patch) | |
| tree | f9bf39d95a7f63c09391961594727fd5a5119fd2 | |
| parent | fc88844d146273a036b2f95d71fd96ca00818ed2 (diff) | |
| download | gitlab-ce-pawel/add-sidekiq-metrics-endpoint-32145.tar.gz | |
Change default port of sidekiq exporter to 3807.pawel/add-sidekiq-metrics-endpoint-32145
Move rack deflate middleware higher in stack
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/metrics/sidekiq_metrics_exporter.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 5ffd187fac4..cf304a496f7 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -589,7 +589,7 @@ production: &base sidekiq_exporter: # enabled: true # address: localhost - # port: 3001 + # port: 3807 # # 5. Extra customization diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index db3d58a74af..d8115bdb26c 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -516,7 +516,7 @@ Settings.monitoring['unicorn_sampler_interval'] ||= 10 Settings.monitoring['sidekiq_exporter'] ||= Settingslogic.new({}) Settings.monitoring.sidekiq_exporter['enabled'] ||= false Settings.monitoring.sidekiq_exporter['address'] ||= 'localhost' -Settings.monitoring.sidekiq_exporter['port'] ||= 3001 +Settings.monitoring.sidekiq_exporter['port'] ||= 3807 # # Testing settings diff --git a/lib/gitlab/metrics/sidekiq_metrics_exporter.rb b/lib/gitlab/metrics/sidekiq_metrics_exporter.rb index c307fd8c0aa..5980a4ded2b 100644 --- a/lib/gitlab/metrics/sidekiq_metrics_exporter.rb +++ b/lib/gitlab/metrics/sidekiq_metrics_exporter.rb @@ -29,8 +29,8 @@ module Gitlab def rack_app Rack::Builder.app do - use ::Prometheus::Client::Rack::Exporter use Rack::Deflater + use ::Prometheus::Client::Rack::Exporter run -> (env) { [404, {}, ['']] } end end |