Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

9 files changed, 121 insertions, 27 deletions

diff --git a/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb b/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
index cf3caf3f0c7..61c071c8738 100644
--- a/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/ci_template_unique_counter.rb
@@ -15,7 +15,7 @@ module Gitlab::UsageDataCounters
         )
 
         namespace = project.namespace
-        if Feature.enabled?(:route_hll_to_snowplow, namespace, default_enabled: :yaml)
+        if Feature.enabled?(:route_hll_to_snowplow, namespace)
           Gitlab::Tracking.event(name, 'ci_templates_unique', namespace: namespace, user: user, project: project)
         end
       end
diff --git a/lib/gitlab/usage_data_counters/editor_unique_counter.rb b/lib/gitlab/usage_data_counters/editor_unique_counter.rb
index bc0126cd893..f97ebdccecf 100644
--- a/lib/gitlab/usage_data_counters/editor_unique_counter.rb
+++ b/lib/gitlab/usage_data_counters/editor_unique_counter.rb
@@ -8,6 +8,7 @@ module Gitlab
       EDIT_BY_WEB_IDE = 'g_edit_by_web_ide'
       EDIT_BY_SSE = 'g_edit_by_sse'
       EDIT_CATEGORY = 'ide_edit'
+      EDIT_BY_LIVE_PREVIEW = 'g_edit_by_live_preview'
 
       class << self
         def track_web_ide_edit_action(author:, time: Time.zone.now)
@@ -47,6 +48,10 @@ module Gitlab
           count_unique(EDIT_BY_SSE, date_from, date_to)
         end
 
+        def track_live_preview_edit_action(author:, time: Time.zone.now)
+          track_unique_action(EDIT_BY_LIVE_PREVIEW, author, time)
+        end
+
         private
 
         def track_unique_action(action, author, time)
diff --git a/lib/gitlab/usage_data_counters/hll_redis_counter.rb b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
index 3b34cd77cf5..0ace6e99c59 100644
--- a/lib/gitlab/usage_data_counters/hll_redis_counter.rb
+++ b/lib/gitlab/usage_data_counters/hll_redis_counter.rb
@@ -185,7 +185,7 @@ module Gitlab
         def feature_enabled?(event)
           return true if event[:feature_flag].blank?
 
-          Feature.enabled?(event[:feature_flag], default_enabled: :yaml) && Feature.enabled?(:redis_hll_tracking, type: :ops, default_enabled: :yaml)
+          Feature.enabled?(event[:feature_flag]) && Feature.enabled?(:redis_hll_tracking, type: :ops)
         end
 
         # Allow to add totals for events that are in the same redis slot, category and have the same aggregation level
diff --git a/lib/gitlab/usage_data_counters/ipynb_diff_activity_counter.rb b/lib/gitlab/usage_data_counters/ipynb_diff_activity_counter.rb
new file mode 100644
index 00000000000..a34ae909c82
--- /dev/null
+++ b/lib/gitlab/usage_data_counters/ipynb_diff_activity_counter.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# noinspection RubyConstantNamingConvention
+module Gitlab
+  module UsageDataCounters
+    module IpynbDiffActivityCounter
+      NOTE_CREATED_IN_IPYNB_DIFF_ACTION = 'i_code_review_create_note_in_ipynb_diff'
+      USER_CREATED_NOTE_IN_IPYNB_DIFF_ACTION = 'i_code_review_user_create_note_in_ipynb_diff'
+      NOTE_CREATED_IN_IPYNB_DIFF_MR_ACTION = 'i_code_review_create_note_in_ipynb_diff_mr'
+      USER_CREATED_NOTE_IN_IPYNB_DIFF_MR_ACTION = 'i_code_review_user_create_note_in_ipynb_diff_mr'
+      NOTE_CREATED_IN_IPYNB_DIFF_COMMIT_ACTION = 'i_code_review_create_note_in_ipynb_diff_commit'
+      USER_CREATED_NOTE_IN_IPYNB_DIFF_COMMIT_ACTION = 'i_code_review_user_create_note_in_ipynb_diff_commit'
+
+      class << self
+        def note_created(note)
+          return unless note.for_merge_request? || note.for_commit?
+
+          if note.for_merge_request?
+            track(NOTE_CREATED_IN_IPYNB_DIFF_MR_ACTION, USER_CREATED_NOTE_IN_IPYNB_DIFF_MR_ACTION, note)
+          else
+            track(NOTE_CREATED_IN_IPYNB_DIFF_COMMIT_ACTION, USER_CREATED_NOTE_IN_IPYNB_DIFF_COMMIT_ACTION, note)
+          end
+
+          track(NOTE_CREATED_IN_IPYNB_DIFF_ACTION, USER_CREATED_NOTE_IN_IPYNB_DIFF_ACTION, note)
+        end
+
+        private
+
+        def track(action, per_user_action, note)
+          Gitlab::UsageDataCounters::HLLRedisCounter.track_usage_event(action, note.id)
+          Gitlab::UsageDataCounters::HLLRedisCounter.track_usage_event(per_user_action, note.author_id)
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
index f179f6d679d..3b883e505f8 100644
--- a/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ci_templates.yml
@@ -127,6 +127,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_security_sast_iac
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_security_dependency_scanning
   category: ci_templates
   redis_slot: ci_templates
@@ -147,10 +151,6 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_security_cluster_image_scanning
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
 - name: p_ci_templates_qualys_iac_security
   category: ci_templates
   redis_slot: ci_templates
@@ -187,6 +187,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_liquibase
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_flutter
   category: ci_templates
   redis_slot: ci_templates
@@ -207,10 +211,6 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_managed_cluster_applications
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
 - name: p_ci_templates_php
   category: ci_templates
   redis_slot: ci_templates
@@ -231,10 +231,6 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_serverless
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
 - name: p_ci_templates_go
   category: ci_templates
   redis_slot: ci_templates
@@ -255,6 +251,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_matlab
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_deploy_ecs
   category: ci_templates
   redis_slot: ci_templates
@@ -331,6 +331,18 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_jobs_sast_latest
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
+- name: p_ci_templates_jobs_sast_iac
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
+- name: p_ci_templates_jobs_secret_detection_latest
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_jobs_dependency_scanning
   category: ci_templates
   redis_slot: ci_templates
@@ -523,6 +535,18 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_implicit_jobs_sast_latest
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
+- name: p_ci_templates_implicit_jobs_sast_iac
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
+- name: p_ci_templates_implicit_jobs_secret_detection_latest
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_implicit_jobs_dependency_scanning
   category: ci_templates
   redis_slot: ci_templates
@@ -595,6 +619,10 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
+- name: p_ci_templates_implicit_security_sast_iac
+  category: ci_templates
+  redis_slot: ci_templates
+  aggregation: weekly
 - name: p_ci_templates_implicit_security_dependency_scanning
   category: ci_templates
   redis_slot: ci_templates
@@ -615,15 +643,3 @@
   category: ci_templates
   redis_slot: ci_templates
   aggregation: weekly
-- name: p_ci_templates_implicit_security_cluster_image_scanning
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_liquibase
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
-- name: p_ci_templates_matlab
-  category: ci_templates
-  redis_slot: ci_templates
-  aggregation: weekly
diff --git a/lib/gitlab/usage_data_counters/known_events/ci_users.yml b/lib/gitlab/usage_data_counters/known_events/ci_users.yml
index 63498a35858..5159dcf62ab 100644
--- a/lib/gitlab/usage_data_counters/known_events/ci_users.yml
+++ b/lib/gitlab/usage_data_counters/known_events/ci_users.yml
@@ -2,4 +2,4 @@
   category: ci_users
   redis_slot: ci_users
   aggregation: weekly
-  feature_flag: job_deployment_count
+  feature_flag:
diff --git a/lib/gitlab/usage_data_counters/known_events/code_review_events.yml b/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
index df2864bba89..e3bb3f6fef3 100644
--- a/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/code_review_events.yml
@@ -173,6 +173,30 @@
   redis_slot: code_review
   category: code_review
   aggregation: weekly
+- name: i_code_review_create_note_in_ipynb_diff
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_user_create_note_in_ipynb_diff
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_create_note_in_ipynb_diff_mr
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_user_create_note_in_ipynb_diff_mr
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_create_note_in_ipynb_diff_commit
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
+- name: i_code_review_user_create_note_in_ipynb_diff_commit
+  redis_slot: code_review
+  category: code_review
+  aggregation: weekly
 # Diff settings events
 - name: i_code_review_click_diff_view_setting
   redis_slot: code_review
@@ -234,6 +258,7 @@
   redis_slot: code_review
   category: code_review
   aggregation: weekly
+  feature_flag: usage_data_diff_searches
 - name: i_code_review_total_suggestions_applied
   redis_slot: code_review
   category: code_review
diff --git a/lib/gitlab/usage_data_counters/known_events/common.yml b/lib/gitlab/usage_data_counters/known_events/common.yml
index 0d89a5181ec..448ed4c66e1 100644
--- a/lib/gitlab/usage_data_counters/known_events/common.yml
+++ b/lib/gitlab/usage_data_counters/known_events/common.yml
@@ -40,6 +40,11 @@
   redis_slot: edit
   expiry: 29
   aggregation: daily
+- name: g_edit_by_live_preview
+  category: ide_edit
+  redis_slot: edit
+  expiry: 29
+  aggregation: daily
 - name: i_search_total
   category: search
   redis_slot: search
diff --git a/lib/gitlab/usage_data_counters/known_events/epic_events.yml b/lib/gitlab/usage_data_counters/known_events/epic_events.yml
index 82787b7bf29..dd6625a9cc9 100644
--- a/lib/gitlab/usage_data_counters/known_events/epic_events.yml
+++ b/lib/gitlab/usage_data_counters/known_events/epic_events.yml
@@ -218,3 +218,10 @@
   redis_slot: project_management
   aggregation: daily
   feature_flag: track_epics_activity
+
+- name: g_project_management_epic_blocked_removed
+  category: epics_usage
+  redis_slot: project_management
+  aggregation: daily
+  feature_flag: track_epics_activity
+