diff options
Diffstat (limited to 'app/models/project_services/prometheus_service.rb')
| -rw-r--r-- | app/models/project_services/prometheus_service.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb index 950cd4f6859..d0e62a1afba 100644 --- a/app/models/project_services/prometheus_service.rb +++ b/app/models/project_services/prometheus_service.rb @@ -97,13 +97,9 @@ class PrometheusService < MonitoringService def prometheus_client return unless should_return_client? - options = { - allow_local_requests: allow_local_api_url?, - # We should choose more conservative timeouts, but some queries we run are now busting our - # default timeouts, which are stricter. We should make those queries faster instead. - # See https://gitlab.com/gitlab-org/gitlab/-/issues/233109 - timeout: 60 - } + options = prometheus_client_default_options.merge( + allow_local_requests: allow_local_api_url? + ) if behind_iap? # Adds the Authorization header |