From 69b0ff9002af73de066a6f28e4a61ccf1fddd9a7 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 15 Apr 2021 12:09:05 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 lib/gitlab/prometheus/adapter.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/gitlab/prometheus')

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?
-- 
cgit v1.2.3