diff options
author | Reuben Pereira <rpereira@gitlab.com> | 2019-07-31 20:38:15 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-07-31 20:38:15 +0300 |
commit | f5213a38cc6f9a80e98e1cbdf59f84352f0731cb (patch) | |
tree | 7bfbd92c5b58717a9c3bf339e1cca6e0ccfc4492 /app/services/application_settings | |
parent | 3e63fe70ccff3dc477a1740c0a7f164b7caada1f (diff) |
Add prometheus listen address to whitelist
- Add to whitelist so that even if local requests from hooks and
services are not allowed, the prometheus manual configuration will
still succeed.
Diffstat (limited to 'app/services/application_settings')
-rw-r--r-- | app/services/application_settings/update_service.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/services/application_settings/update_service.rb b/app/services/application_settings/update_service.rb index 7eeaf8aade1..471df6e2d0c 100644 --- a/app/services/application_settings/update_service.rb +++ b/app/services/application_settings/update_service.rb @@ -15,6 +15,8 @@ module ApplicationSettings update_terms(@params.delete(:terms)) + add_to_outbound_local_requests_whitelist(@params.delete(:add_to_outbound_local_requests_whitelist)) + if params.key?(:performance_bar_allowed_group_path) params[:performance_bar_allowed_group_id] = performance_bar_allowed_group_id end @@ -32,6 +34,13 @@ module ApplicationSettings params.key?(:usage_ping_enabled) || params.key?(:version_check_enabled) end + def add_to_outbound_local_requests_whitelist(values) + values_array = Array(values).reject(&:empty?) + return if values_array.empty? + + @application_setting.add_to_outbound_local_requests_whitelist(values_array) + end + def update_terms(terms) return unless terms.present? |