Add latest changes from gitlab-org/gitlab@master

1 files changed, 20 insertions, 2 deletions

diff --git a/app/models/analytics/instance_statistics/measurement.rb b/app/models/analytics/instance_statistics/measurement.rb
index eaaf9e999b3..c724cdf22a5 100644
--- a/app/models/analytics/instance_statistics/measurement.rb
+++ b/app/models/analytics/instance_statistics/measurement.rb
@@ -3,13 +3,19 @@
 module Analytics
   module InstanceStatistics
     class Measurement < ApplicationRecord
+      EXPERIMENTAL_IDENTIFIERS = %i[pipelines_succeeded pipelines_failed pipelines_canceled pipelines_skipped].freeze
+
       enum identifier: {
         projects: 1,
         users: 2,
         issues: 3,
         merge_requests: 4,
         groups: 5,
-        pipelines: 6
+        pipelines: 6,
+        pipelines_succeeded: 7,
+        pipelines_failed: 8,
+        pipelines_canceled: 9,
+        pipelines_skipped: 10
       }
 
       IDENTIFIER_QUERY_MAPPING = {
@@ -18,7 +24,11 @@ module Analytics
         identifiers[:issues] => -> { Issue },
         identifiers[:merge_requests] => -> { MergeRequest },
         identifiers[:groups] => -> { Group },
-        identifiers[:pipelines] => -> { Ci::Pipeline }
+        identifiers[:pipelines] => -> { Ci::Pipeline },
+        identifiers[:pipelines_succeeded] => -> { Ci::Pipeline.success },
+        identifiers[:pipelines_failed] => -> { Ci::Pipeline.failed },
+        identifiers[:pipelines_canceled] => -> { Ci::Pipeline.canceled },
+        identifiers[:pipelines_skipped] => -> { Ci::Pipeline.skipped }
       }.freeze
 
       validates :recorded_at, :identifier, :count, presence: true
@@ -26,6 +36,14 @@ module Analytics
 
       scope :order_by_latest, -> { order(recorded_at: :desc) }
       scope :with_identifier, -> (identifier) { where(identifier: identifier) }
+
+      def self.measurement_identifier_values
+        if Feature.enabled?(:store_ci_pipeline_counts_by_status)
+          identifiers.values
+        else
+          identifiers.values - EXPERIMENTAL_IDENTIFIERS.map { |identifier| identifiers[identifier] }
+        end
+      end
     end
   end
 end