Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/gitlab/analytics/cycle_analytics/request_params.rb b/lib/gitlab/analytics/cycle_analytics/request_params.rb
index bc9d94ef09c..bc270fd784a 100644
--- a/lib/gitlab/analytics/cycle_analytics/request_params.rb
+++ b/lib/gitlab/analytics/cycle_analytics/request_params.rb
@@ -86,6 +86,7 @@ module Gitlab
 
         def to_data_attributes
           {}.tap do |attrs|
+            attrs[:aggregation] = aggregation_attributes if group
             attrs[:group] = group_data_attributes if group
             attrs[:value_stream] = value_stream_data_attributes.to_json if value_stream
             attrs[:created_after] = created_after.to_date.iso8601
@@ -103,6 +104,15 @@ module Gitlab
 
         private
 
+        def aggregation_attributes
+          aggregation = ::Analytics::CycleAnalytics::Aggregation.safe_create_for_group(group)
+          {
+            enabled: aggregation.enabled.to_s,
+            last_run_at: aggregation.last_incremental_run_at,
+            next_run_at: aggregation.estimated_next_run_at
+          }
+        end
+
         def group_data_attributes
           {
             id: group.id,