diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-15 15:09:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-15 15:09:05 +0300 |
| commit | 69b0ff9002af73de066a6f28e4a61ccf1fddd9a7 (patch) | |
| tree | 3293d32d37eebcbe07b6e23a3ee02f203846f8cd /lib/gitlab/prometheus | |
| parent | 73ff43129b98d433923d144fccd2e47c33c3b091 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/prometheus')
| -rw-r--r-- | lib/gitlab/prometheus/adapter.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/gitlab/prometheus/adapter.rb b/lib/gitlab/prometheus/adapter.rb index ed10ef2917f..76e65d29c7a 100644 --- a/lib/gitlab/prometheus/adapter.rb +++ b/lib/gitlab/prometheus/adapter.rb @@ -19,6 +19,10 @@ module Gitlab end def cluster_prometheus_adapter + if cluster&.integration_prometheus + return cluster.integration_prometheus + end + application = cluster&.application_prometheus application if application&.available? |