diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-10 03:10:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-10 03:10:37 +0300 |
commit | 06d5641a544be4c5605ef2b7dcad43d841386ede (patch) | |
tree | 21856b2215a85a171977f9f9e1e4ded12a6ba4af /lib/gitlab/prometheus | |
parent | 2051d3c9cece72167a237002c309c720924c88cf (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/prometheus')
-rw-r--r-- | lib/gitlab/prometheus/adapter.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/gitlab/prometheus/adapter.rb b/lib/gitlab/prometheus/adapter.rb index 76e65d29c7a..45438d9bf7c 100644 --- a/lib/gitlab/prometheus/adapter.rb +++ b/lib/gitlab/prometheus/adapter.rb @@ -19,13 +19,11 @@ module Gitlab end def cluster_prometheus_adapter - if cluster&.integration_prometheus - return cluster.integration_prometheus - end - application = cluster&.application_prometheus + return application if application&.available? - application if application&.available? + integration = cluster&.integration_prometheus + integration if integration&.available? end private |