Backports relevant changes made in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5163 to CE

3 files changed, 20 insertions, 5 deletions

diff --git a/app/models/clusters/applications/prometheus.rb b/app/models/clusters/applications/prometheus.rb
index 48137c2ed68..ea6ec4d6b03 100644
--- a/app/models/clusters/applications/prometheus.rb
+++ b/app/models/clusters/applications/prometheus.rb
@@ -21,6 +21,14 @@ module Clusters
         end
       end
 
+      def ready_status
+        [:installed]
+      end
+
+      def ready?
+        ready_status.include?(status_name)
+      end
+
       def chart
         'stable/prometheus'
       end
diff --git a/app/models/concerns/prometheus_adapter.rb b/app/models/concerns/prometheus_adapter.rb
index 18cbbd871a1..9c36f633395 100644
--- a/app/models/concerns/prometheus_adapter.rb
+++ b/app/models/concerns/prometheus_adapter.rb
@@ -24,11 +24,10 @@ module PrometheusAdapter
     def query(query_name, *args)
       return unless can_query?
 
-      query_class = Gitlab::Prometheus::Queries.const_get("#{query_name.to_s.classify}Query")
+      query_class = query_klass_for(query_name)
+      query_args = build_query_args(*args)
 
-      args.map!(&:id)
-
-      with_reactive_cache(query_class.name, *args, &query_class.method(:transform_reactive_result))
+      with_reactive_cache(query_class.name, *query_args, &query_class.method(:transform_reactive_result))
     end
 
     # Cache metrics for specific environment
@@ -44,5 +43,13 @@ module PrometheusAdapter
     rescue Gitlab::PrometheusClient::Error => err
       { success: false, result: err.message }
     end
+
+    def query_klass_for(query_name)
+      Gitlab::Prometheus::Queries.const_get("#{query_name.to_s.classify}Query")
+    end
+
+    def build_query_args(*args)
+      args.map(&:id)
+    end
   end
 end
diff --git a/app/models/internal_id.rb b/app/models/internal_id.rb
index f50f28deffe..6a3e27625e9 100644
--- a/app/models/internal_id.rb
+++ b/app/models/internal_id.rb
@@ -14,7 +14,7 @@ class InternalId < ActiveRecord::Base
   belongs_to :project
   belongs_to :namespace
 
-  enum usage: { issues: 0, merge_requests: 1, deployments: 2, milestones: 3, epics: 4, ci_pipelines: 5 }
+  enum usage: { issues: 0, merge_requests: 1, deployments: 2, milestones: 3, epics: 4, ci_pipelines: 5, prometheus_alerts: 6 }
 
   validates :usage, presence: true