Add per deployment additional metrics

2 files changed, 32 insertions, 11 deletions

diff --git a/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
new file mode 100644
index 00000000000..382052c298f
--- /dev/null
+++ b/lib/gitlab/prometheus/queries/additional_metrics_deployment_query.rb
@@ -0,0 +1,17 @@
+module Gitlab::Prometheus::Queries
+  class AdditionalMetricsDeploymentQuery < AdditionalMetricsQuery
+
+    def query(deployment_id)
+      deployment = Deployment.find_by(id: deployment_id)
+      query_context = {
+        environment_slug: deployment.environment.slug,
+        environment_filter: %{container_name!="POD",environment="#{deployment.environment.slug}"},
+        timeframe_start: (deployment.created_at - 30.minutes).to_f,
+        timeframe_end: (deployment.created_at + 30.minutes).to_f
+      }
+
+      query_metrics(query_context)
+    end
+  end
+end
+
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
index de0dab0b19c..c48fcadee57 100644
--- a/lib/gitlab/prometheus/queries/additional_metrics_query.rb
+++ b/lib/gitlab/prometheus/queries/additional_metrics_query.rb
@@ -1,7 +1,21 @@
 module Gitlab::Prometheus::Queries
   class AdditionalMetricsQuery < BaseQuery
     def query(environment_id)
-      query_processor = method(:process_query).curry[query_context(environment_id)]
+      environment = Environment.find_by(id: environment_id)
+      query_context = {
+        environment_slug: environment.slug,
+        environment_filter: %{container_name!="POD",environment="#{environment.slug}"},
+        timeframe_start: 8.hours.ago.to_f,
+        timeframe_end: Time.now.to_f
+      }
+
+      query_metrics(query_context)
+    end
+
+    protected
+
+    def query_metrics(query_context)
+      query_processor = method(:process_query).curry[query_context]
 
       matched_metrics.map do |group|
         metrics = group.metrics.map do |metric|
@@ -22,16 +36,6 @@ module Gitlab::Prometheus::Queries
 
     private
 
-    def query_context(environment_id)
-      environment = Environment.find_by(id: environment_id)
-      {
-        environment_slug: environment.slug,
-        environment_filter: %{container_name!="POD",environment="#{environment.slug}"},
-        timeframe_start: 8.hours.ago.to_f,
-        timeframe_end: Time.now.to_f
-      }
-    end
-
     def process_query(context, query)
       query_with_result = query.dup
       query_with_result[:result] =