diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 15:08:45 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 15:08:45 +0000 |
commit | 874c603d7a21724885ed24f15f457146aa1497c2 (patch) | |
tree | 9b562f45f9e79cd0bbba8e94e69511f620a1c3ed /app/services/prometheus/proxy_service.rb | |
parent | 8eef083ccd59505b606e9733d38589cbd3d01fdf (diff) | |
download | gitlab-ce-874c603d7a21724885ed24f15f457146aa1497c2.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/prometheus/proxy_service.rb')
-rw-r--r-- | app/services/prometheus/proxy_service.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/services/prometheus/proxy_service.rb b/app/services/prometheus/proxy_service.rb index e0bc5518d30..33635796771 100644 --- a/app/services/prometheus/proxy_service.rb +++ b/app/services/prometheus/proxy_service.rb @@ -22,16 +22,20 @@ module Prometheus attr_accessor :proxyable, :method, :path, :params + PROMETHEUS_QUERY_API = 'query' + PROMETHEUS_QUERY_RANGE_API = 'query_range' + PROMETHEUS_SERIES_API = 'series' + PROXY_SUPPORT = { - 'query' => { + PROMETHEUS_QUERY_API => { method: ['GET'], params: %w(query time timeout) }, - 'query_range' => { + PROMETHEUS_QUERY_RANGE_API => { method: ['GET'], params: %w(query start end step timeout) }, - 'series' => { + PROMETHEUS_SERIES_API => { method: %w(GET), params: %w(match start end) } |