From 18521584bd6cfc8de9511722696e87aef59795c5 Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Mon, 3 Jul 2017 17:09:34 +0200 Subject: Remove the need to use health check token in favor of whitelist that will be used to control the access to monitoring resources --- config/gitlab.yml.example | 6 ++++++ config/initializers/1_settings.rb | 7 +++++++ 2 files changed, 13 insertions(+) (limited to 'config') diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 4b81fd90f59..a49929a05b2 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -548,6 +548,12 @@ production: &base # unicorn_sampler_interval: 10 + ## Monitoring + # Built in monitoring settings + monitoring: + # IP whitelist to access monitoring endpoints + access_whitelist: 127.0.0.0/8 + # # 5. Extra customization # ========================== diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index cb11d2c34f4..0c0dcd8413e 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -494,6 +494,13 @@ Settings.webpack.dev_server['enabled'] ||= false Settings.webpack.dev_server['host'] ||= 'localhost' Settings.webpack.dev_server['port'] ||= 3808 +# +# Monitoring settings +# +Settings['monitoring'] ||= Settingslogic.new({}) +Settings.monitoring['ip_whitelist'] ||= %w{127.0.0.1/8} +Settings.monitoring.ip_whitelist.map!(&IPAddr.method(:new)) + # # Prometheus metrics settings # -- cgit v1.2.3 From c1b043bdb764c39c9d1af4b141b65185b71efae6 Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Mon, 3 Jul 2017 22:41:33 +0200 Subject: Bring back healthcheck token access to monitoring resources, but mark this as deprecated --- config/gitlab.yml.example | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'config') diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index a49929a05b2..c31b7e12fdc 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -552,7 +552,8 @@ production: &base # Built in monitoring settings monitoring: # IP whitelist to access monitoring endpoints - access_whitelist: 127.0.0.0/8 + ip_whitelist: + - 127.0.0.0/8 # # 5. Extra customization -- cgit v1.2.3 From de6c3597abb58a73e6b8aefd4e45bfafb2a35988 Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Tue, 4 Jul 2017 00:46:44 +0200 Subject: correctly handle transforming settings into useful datastructure --- config/initializers/1_settings.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'config') diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 0c0dcd8413e..31c6bea9ed5 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -499,7 +499,6 @@ Settings.webpack.dev_server['port'] ||= 3808 # Settings['monitoring'] ||= Settingslogic.new({}) Settings.monitoring['ip_whitelist'] ||= %w{127.0.0.1/8} -Settings.monitoring.ip_whitelist.map!(&IPAddr.method(:new)) # # Prometheus metrics settings -- cgit v1.2.3 From 6d60e265b1bb0212803d301d723c12affe366397 Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Wed, 5 Jul 2017 00:12:21 +0200 Subject: Add spaces between test phases + fix wrong test setup --- config/initializers/1_settings.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 31c6bea9ed5..56869f9b934 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -498,7 +498,7 @@ Settings.webpack.dev_server['port'] ||= 3808 # Monitoring settings # Settings['monitoring'] ||= Settingslogic.new({}) -Settings.monitoring['ip_whitelist'] ||= %w{127.0.0.1/8} +Settings.monitoring['ip_whitelist'] ||= ['127.0.0.1/8'] # # Prometheus metrics settings -- cgit v1.2.3 From 1eca48819a7cc78a5e96d617332bbee0365e6dca Mon Sep 17 00:00:00 2001 From: Pawel Chojnacki Date: Wed, 5 Jul 2017 00:51:01 +0200 Subject: Merge prometheus unicorn sampler settigns within monitoring settings --- config/gitlab.yml.example | 6 ++---- config/initializers/1_settings.rb | 7 +------ config/initializers/8_metrics.rb | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) (limited to 'config') diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c31b7e12fdc..e588b813c50 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -543,14 +543,12 @@ production: &base # enabled: true # host: localhost # port: 3808 - prometheus: - # Time between sampling of unicorn socket metrics, in seconds - # unicorn_sampler_interval: 10 - ## Monitoring # Built in monitoring settings monitoring: + # Time between sampling of unicorn socket metrics, in seconds + # unicorn_sampler_interval: 10 # IP whitelist to access monitoring endpoints ip_whitelist: - 127.0.0.0/8 diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 56869f9b934..ef3122f5cf9 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -499,12 +499,7 @@ Settings.webpack.dev_server['port'] ||= 3808 # Settings['monitoring'] ||= Settingslogic.new({}) Settings.monitoring['ip_whitelist'] ||= ['127.0.0.1/8'] - -# -# Prometheus metrics settings -# -Settings['prometheus'] ||= Settingslogic.new({}) -Settings.prometheus['unicorn_sampler_interval'] ||= 10 +Settings.monitoring['unicorn_sampler_interval'] ||= 10 # # Testing settings diff --git a/config/initializers/8_metrics.rb b/config/initializers/8_metrics.rb index d56fd7a6cfa..5e34aac6527 100644 --- a/config/initializers/8_metrics.rb +++ b/config/initializers/8_metrics.rb @@ -119,7 +119,7 @@ def instrument_classes(instrumentation) end # rubocop:enable Metrics/AbcSize -Gitlab::Metrics::UnicornSampler.initialize_instance(Settings.prometheus.unicorn_sampler_interval).start +Gitlab::Metrics::UnicornSampler.initialize_instance(Settings.monitoring.unicorn_sampler_interval).start Gitlab::Application.configure do |config| # 0 should be Sentry to catch errors in this middleware -- cgit v1.2.3