Merge branch 'convert-events-to-list-yml' into 'master'

Change array representation of events in YAML list syntax

See merge request gitlab-org/gitlab!56480

doc/development/usage_ping/index.md

@@ -957,7 +957,10 @@ Example aggregated metric entries:
 ```yaml
 - name: example_metrics_union
   operator: OR
-  events: ['i_search_total', 'i_search_advanced', 'i_search_paid']
+  events: 
+    - 'i_search_total'
+    - 'i_search_advanced'
+    - 'i_search_paid'
   source: redis
   time_frame:
     - 7d
@@ -968,7 +971,9 @@ Example aggregated metric entries:
   time_frame:
     - 28d
     - all
-  events: ['dependency_scanning_pipeline_all_time', 'container_scanning_pipeline_all_time']
+  events:
+    - 'dependency_scanning_pipeline_all_time'
+    - 'container_scanning_pipeline_all_time'
   feature_flag: example_aggregated_metric
 ```
 
@@ -1099,7 +1104,9 @@ Example definition:
 - name: example_metrics_intersection_database_sourced
   operator: AND
   source: database
-  events: ['dependency_scanning_pipeline', 'container_scanning_pipeline']
+  events:
+    - 'dependency_scanning_pipeline'
+    - 'container_scanning_pipeline'
   time_frame:
     - 28d
     - all

ee/lib/gitlab/usage_data_counters/aggregated_metrics/common.yml

@@ -17,5 +17,7 @@
 - name: product_analytics_test_metrics_intersection_database_sourced
   source: database
   time_frame: [28d]
-  events: ['dependency_scanning_pipeline', 'container_scanning_pipeline']
+  events:
+    - 'dependency_scanning_pipeline'
+    - 'container_scanning_pipeline'
   operator: AND

lib/gitlab/usage_data_counters/aggregated_metrics/code_review.yml

@@ -12,97 +12,94 @@
   feature_flag: usage_data_code_review_aggregation
   source: redis
   time_frame: [7d, 28d]
-  events: [
-    'i_code_review_user_single_file_diffs',
-    'i_code_review_user_create_mr',
-    'i_code_review_user_close_mr',
-    'i_code_review_user_reopen_mr',
-    'i_code_review_user_resolve_thread',
-    'i_code_review_user_unresolve_thread',
-    'i_code_review_edit_mr_title',
-    'i_code_review_edit_mr_desc',
-    'i_code_review_user_merge_mr',
-    'i_code_review_user_create_mr_comment',
-    'i_code_review_user_edit_mr_comment',
-    'i_code_review_user_remove_mr_comment',
-    'i_code_review_user_create_review_note',
-    'i_code_review_user_publish_review',
-    'i_code_review_user_create_multiline_mr_comment',
-    'i_code_review_user_edit_multiline_mr_comment',
-    'i_code_review_user_remove_multiline_mr_comment',
-    'i_code_review_user_add_suggestion',
-    'i_code_review_user_apply_suggestion',
-    'i_code_review_user_assigned',
-    'i_code_review_user_review_requested',
-    'i_code_review_user_approve_mr',
-    'i_code_review_user_unapprove_mr',
-    'i_code_review_user_marked_as_draft',
-    'i_code_review_user_unmarked_as_draft',
-    'i_code_review_user_approval_rule_added',
-    'i_code_review_user_approval_rule_deleted',
-    'i_code_review_user_approval_rule_edited',
-    'i_code_review_user_vs_code_api_request',
-    'i_code_review_user_toggled_task_item_status',
-    'i_code_review_user_create_mr_from_issue',
-    'i_code_review_user_mr_discussion_locked',
-    'i_code_review_user_mr_discussion_unlocked',
-    'i_code_review_user_time_estimate_changed',
-    'i_code_review_user_time_spent_changed',
-    'i_code_review_user_assignees_changed',
-    'i_code_review_user_reviewers_changed',
-    'i_code_review_user_milestone_changed',
-    'i_code_review_user_labels_changed'
-  ]
+  events:
+    - 'i_code_review_user_single_file_diffs'
+    - 'i_code_review_user_create_mr'
+    - 'i_code_review_user_close_mr'
+    - 'i_code_review_user_reopen_mr'
+    - 'i_code_review_user_resolve_thread'
+    - 'i_code_review_user_unresolve_thread'
+    - 'i_code_review_edit_mr_title'
+    - 'i_code_review_edit_mr_desc'
+    - 'i_code_review_user_merge_mr'
+    - 'i_code_review_user_create_mr_comment'
+    - 'i_code_review_user_edit_mr_comment'
+    - 'i_code_review_user_remove_mr_comment'
+    - 'i_code_review_user_create_review_note'
+    - 'i_code_review_user_publish_review'
+    - 'i_code_review_user_create_multiline_mr_comment'
+    - 'i_code_review_user_edit_multiline_mr_comment'
+    - 'i_code_review_user_remove_multiline_mr_comment'
+    - 'i_code_review_user_add_suggestion'
+    - 'i_code_review_user_apply_suggestion'
+    - 'i_code_review_user_assigned'
+    - 'i_code_review_user_review_requested'
+    - 'i_code_review_user_approve_mr'
+    - 'i_code_review_user_unapprove_mr'
+    - 'i_code_review_user_marked_as_draft'
+    - 'i_code_review_user_unmarked_as_draft'
+    - 'i_code_review_user_approval_rule_added'
+    - 'i_code_review_user_approval_rule_deleted'
+    - 'i_code_review_user_approval_rule_edited'
+    - 'i_code_review_user_vs_code_api_request'
+    - 'i_code_review_user_toggled_task_item_status'
+    - 'i_code_review_user_create_mr_from_issue'
+    - 'i_code_review_user_mr_discussion_locked'
+    - 'i_code_review_user_mr_discussion_unlocked'
+    - 'i_code_review_user_time_estimate_changed'
+    - 'i_code_review_user_time_spent_changed'
+    - 'i_code_review_user_assignees_changed'
+    - 'i_code_review_user_reviewers_changed'
+    - 'i_code_review_user_milestone_changed'
+    - 'i_code_review_user_labels_changed'
 - name: code_review_category_monthly_active_users
   operator: OR
   feature_flag: usage_data_code_review_aggregation
   source: redis
   time_frame: [7d, 28d]
-  events: [
-    'i_code_review_user_single_file_diffs',
-    'i_code_review_user_create_mr',
-    'i_code_review_user_close_mr',
-    'i_code_review_user_reopen_mr',
-    'i_code_review_user_resolve_thread',
-    'i_code_review_user_unresolve_thread',
-    'i_code_review_edit_mr_title',
-    'i_code_review_edit_mr_desc',
-    'i_code_review_user_merge_mr',
-    'i_code_review_user_create_mr_comment',
-    'i_code_review_user_edit_mr_comment',
-    'i_code_review_user_remove_mr_comment',
-    'i_code_review_user_create_review_note',
-    'i_code_review_user_publish_review',
-    'i_code_review_user_create_multiline_mr_comment',
-    'i_code_review_user_edit_multiline_mr_comment',
-    'i_code_review_user_remove_multiline_mr_comment',
-    'i_code_review_user_add_suggestion',
-    'i_code_review_user_apply_suggestion',
-    'i_code_review_user_assigned',
-    'i_code_review_user_review_requested',
-    'i_code_review_user_approve_mr',
-    'i_code_review_user_unapprove_mr',
-    'i_code_review_user_marked_as_draft',
-    'i_code_review_user_unmarked_as_draft',
-    'i_code_review_user_approval_rule_added',
-    'i_code_review_user_approval_rule_deleted',
-    'i_code_review_user_approval_rule_edited',
-    'i_code_review_user_toggled_task_item_status',
-    'i_code_review_user_create_mr_from_issue',
-    'i_code_review_user_mr_discussion_locked',
-    'i_code_review_user_mr_discussion_unlocked',
-    'i_code_review_user_time_estimate_changed',
-    'i_code_review_user_time_spent_changed',
-    'i_code_review_user_assignees_changed',
-    'i_code_review_user_reviewers_changed',
-    'i_code_review_user_milestone_changed',
-    'i_code_review_user_labels_changed'
-  ]
+  events:
+    - 'i_code_review_user_single_file_diffs'
+    - 'i_code_review_user_create_mr'
+    - 'i_code_review_user_close_mr'
+    - 'i_code_review_user_reopen_mr'
+    - 'i_code_review_user_resolve_thread'
+    - 'i_code_review_user_unresolve_thread'
+    - 'i_code_review_edit_mr_title'
+    - 'i_code_review_edit_mr_desc'
+    - 'i_code_review_user_merge_mr'
+    - 'i_code_review_user_create_mr_comment'
+    - 'i_code_review_user_edit_mr_comment'
+    - 'i_code_review_user_remove_mr_comment'
+    - 'i_code_review_user_create_review_note'
+    - 'i_code_review_user_publish_review'
+    - 'i_code_review_user_create_multiline_mr_comment'
+    - 'i_code_review_user_edit_multiline_mr_comment'
+    - 'i_code_review_user_remove_multiline_mr_comment'
+    - 'i_code_review_user_add_suggestion'
+    - 'i_code_review_user_apply_suggestion'
+    - 'i_code_review_user_assigned'
+    - 'i_code_review_user_review_requested'
+    - 'i_code_review_user_approve_mr'
+    - 'i_code_review_user_unapprove_mr'
+    - 'i_code_review_user_marked_as_draft'
+    - 'i_code_review_user_unmarked_as_draft'
+    - 'i_code_review_user_approval_rule_added'
+    - 'i_code_review_user_approval_rule_deleted'
+    - 'i_code_review_user_approval_rule_edited'
+    - 'i_code_review_user_toggled_task_item_status'
+    - 'i_code_review_user_create_mr_from_issue'
+    - 'i_code_review_user_mr_discussion_locked'
+    - 'i_code_review_user_mr_discussion_unlocked'
+    - 'i_code_review_user_time_estimate_changed'
+    - 'i_code_review_user_time_spent_changed'
+    - 'i_code_review_user_assignees_changed'
+    - 'i_code_review_user_reviewers_changed'
+    - 'i_code_review_user_milestone_changed'
+    - 'i_code_review_user_labels_changed'
 - name: code_review_extension_category_monthly_active_users
   operator: OR
   feature_flag: usage_data_code_review_aggregation
   source: redis
   time_frame: [7d, 28d]
-  events: [
-    'i_code_review_user_vs_code_api_request'
-  ]
+  events:
+    - 'i_code_review_user_vs_code_api_request'

lib/gitlab/usage_data_counters/aggregated_metrics/common.yml

@@ -21,52 +21,60 @@
   operator: OR
   source: redis
   time_frame: [7d, 28d]
-  events: ['g_compliance_audit_events', 'g_compliance_dashboard', 'i_compliance_audit_events', 'a_compliance_audit_events_api', 'i_compliance_credential_inventory']
+  events:
+    - 'g_compliance_audit_events'
+    - 'g_compliance_dashboard'
+    - 'i_compliance_audit_events'
+    - 'a_compliance_audit_events_api'
+    - 'i_compliance_credential_inventory'
 - name: product_analytics_test_metrics_union
   operator: OR
   source: redis
   time_frame: [7d, 28d]
-  events: ['i_search_total', 'i_search_advanced', 'i_search_paid']
+  events:
+    - 'i_search_total'
+    - 'i_search_advanced'
+    - 'i_search_paid'
 - name: product_analytics_test_metrics_intersection
   operator: AND
   source: redis
   time_frame: [7d, 28d]
-  events: ['i_search_total', 'i_search_advanced', 'i_search_paid']
+  events:
+    - 'i_search_total'
+    - 'i_search_advanced'
+    - 'i_search_paid'
 - name: incident_management_alerts_total_unique_counts
   operator: OR
   source: redis
   time_frame: [7d, 28d]
-  events: [
-    'incident_management_alert_status_changed',
-    'incident_management_alert_assigned',
-    'incident_management_alert_todo',
-    'incident_management_alert_create_incident'
-  ]
+  events:
+    - 'incident_management_alert_status_changed'
+    - 'incident_management_alert_assigned'
+    - 'incident_management_alert_todo'
+    - 'incident_management_alert_create_incident'
 - name: incident_management_incidents_total_unique_counts
   operator: OR
   source: redis
   time_frame: [7d, 28d]
-  events: [
-    'incident_management_incident_created',
-    'incident_management_incident_reopened',
-    'incident_management_incident_closed',
-    'incident_management_incident_assigned',
-    'incident_management_incident_todo',
-    'incident_management_incident_comment',
-    'incident_management_incident_zoom_meeting',
-    'incident_management_incident_published',
-    'incident_management_incident_relate',
-    'incident_management_incident_unrelate',
-    'incident_management_incident_change_confidential'
-  ]
+  events:
+    - 'incident_management_incident_created'
+    - 'incident_management_incident_reopened'
+    - 'incident_management_incident_closed'
+    - 'incident_management_incident_assigned'
+    - 'incident_management_incident_todo'
+    - 'incident_management_incident_comment'
+    - 'incident_management_incident_zoom_meeting'
+    - 'incident_management_incident_published'
+    - 'incident_management_incident_relate'
+    - 'incident_management_incident_unrelate'
+    - 'incident_management_incident_change_confidential'
 - name: i_testing_paid_monthly_active_user_total
   operator: OR
   source: redis
   time_frame: [7d, 28d]
-  events: [
-    'i_testing_web_performance_widget_total',
-    'i_testing_full_code_quality_report_total',
-    'i_testing_group_code_coverage_visit_total',
-    'i_testing_load_performance_widget_total',
-    'i_testing_metrics_report_widget_total'
-  ]
+  events:
+    - 'i_testing_web_performance_widget_total'
+    - 'i_testing_full_code_quality_report_total'
+    - 'i_testing_group_code_coverage_visit_total'
+    - 'i_testing_load_performance_widget_total'
+    - 'i_testing_metrics_report_widget_total'