diff options
| author | David Wilkins <dwilkins@gitlab.com> | 2019-08-07 05:42:20 +0300 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-07 05:42:20 +0300 |
| commit | 467a411e8892ecd6a3be7cd2f6772665f2c63651 (patch) | |
| tree | c7ee78a5f64224569be50ae2534e10ce566fe6df /app/services/prometheus/proxy_service.rb | |
| parent | b67ed9c96720864b9ddae973b34f7456c9321789 (diff) | |
Convert RestClient to Gitlab::HTTP for Prometheus Monitor
- Closes #60024
- Change PrometheusClient.new to accept a base url instead of an
already created RestClient
- Use Gitlab::HTTP in PrometheusClient instead of creating RestClient
in PrometheusService
- Move http_options from PrometheusService to
PrometheusClient (follow_redirects: false)
- ensure that base urls don't have the trailing slash
- Created a `PrometheusClient#url` method that might not be strictly
required
- Change rescued exceptions from RestClient::* to
HTTParty::ResponseError where possible and StandardError for the
rest
Diffstat (limited to 'app/services/prometheus/proxy_service.rb')
| -rw-r--r-- | app/services/prometheus/proxy_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/prometheus/proxy_service.rb b/app/services/prometheus/proxy_service.rb index c5d2b84878b..a62eb76b8ce 100644 --- a/app/services/prometheus/proxy_service.rb +++ b/app/services/prometheus/proxy_service.rb @@ -98,7 +98,7 @@ module Prometheus end def prometheus_client_wrapper - prometheus_adapter&.prometheus_client_wrapper + prometheus_adapter&.prometheus_client end def can_query? |