Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 2 deletions

diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb
index 75dfad4f3df..fd4ee069041 100644
--- a/app/models/project_services/prometheus_service.rb
+++ b/app/models/project_services/prometheus_service.rb
@@ -81,7 +81,7 @@ class PrometheusService < MonitoringService
   def prometheus_client
     return unless should_return_client?
 
-    Gitlab::PrometheusClient.new(api_url)
+    Gitlab::PrometheusClient.new(api_url, allow_local_requests: allow_local_api_url?)
   end
 
   def prometheus_available?
@@ -94,7 +94,8 @@ class PrometheusService < MonitoringService
   end
 
   def allow_local_api_url?
-    self_monitoring_project? && internal_prometheus_url?
+    allow_local_requests_from_web_hooks_and_services? ||
+    (self_monitoring_project? && internal_prometheus_url?)
   end
 
   def configured?
@@ -111,6 +112,10 @@ class PrometheusService < MonitoringService
     api_url.present? && api_url == ::Gitlab::Prometheus::Internal.uri
   end
 
+  def allow_local_requests_from_web_hooks_and_services?
+    current_settings.allow_local_requests_from_web_hooks_and_services?
+  end
+
   def should_return_client?
     api_url.present? && manual_configuration? && active? && valid?
   end