Add per deployment additional metrics

Author: pawelchcki

app/controllers/projects/deployments_controller.rb

@@ -22,6 +22,17 @@ def metrics
     render_404
   end
 
+  def additional_metrics
+    return render_404 unless deployment.has_additional_metrics?
+    metrics = deployment.additional_metrics
+
+    if metrics&.any?
+      render json: metrics, status: :ok
+    else
+      head :no_content
+    end
+  end
+
   private
 
   def deployment

app/models/deployment.rb

@@ -103,12 +103,22 @@ def has_metrics?
     project.monitoring_service.present?
   end
 
+  def has_additional_metrics?
+    has_metrics? && project.monitoring_service&.respond_to?(:reactive_query)
+  end
+
   def metrics
     return {} unless has_metrics?
 
     project.monitoring_service.deployment_metrics(self)
   end
 
+  def additional_metrics
+    return {} unless has_additional_metrics?
+    metrics = project.monitoring_service.reactive_query(Gitlab::Prometheus::Queries::AdditionalMetricsDeploymentQuery.name, id, &:itself)
+    metrics&.merge(deployment_time: created_at.to_i) || {}
+  end
+
   private
 
   def ref_path

config/routes/project.rb

@@ -167,6 +167,7 @@
         resources :deployments, only: [:index] do
           member do
             get :metrics
+            get :additional_metrics
           end
         end
       end

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
+

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 @@ def query(environment_id)
 
     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] =