diff --git a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
index b6381d8342bed392931dd0165c8df57767de5944..4c4cc38117a9d4410eb56b3eccbdcd3cb86af983 100644
--- a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_viewing_analytics_group_devops_adoption
diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
index b6c1f2ea507df5670759c30771cd13fe8608d9b6..92cd38b71c2b71b42d57da3022b9bf79afdd90cd 100644
--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_viewing_analytics_group_devops_adoption
diff --git a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
index 618d65d14f8b493ac096e3bb66c51a36f11339d9..f9799f2d19bab74e9420d8f645564968a5e6a576 100644
--- a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
@@ -12,7 +12,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_edit_by_web_ide
diff --git a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
index 02c0a290e9e2b2816e8cd2d60a585f3efb8077c2..48e6bbea48aadb97228bf318de950d06296ce4ba 100644
--- a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_edit_by_web_ide
diff --git a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
index 854c4407ce553c3a5c6c1228808db202b34c3988..0a82e2baa5a1bfe81cf0a30c1d19c4b5748eb683 100644
--- a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
@@ -15,7 +15,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_search_total
diff --git a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
index 9d0b5f8ed191a489d4864b526054cf9ccce5530e..3061d2c504d912cfc4739fc87941449aa79bbbd7 100644
--- a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
@@ -12,7 +12,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'incident_management_alert_status_changed'
diff --git a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
index 7a92a8a2af779ce0e0a711c2d2084d0be22ed8fb..152c6e22d7727b881740bf35d7c9d17ae23ccea8 100644
--- a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
@@ -12,7 +12,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'incident_management_incident_created'
diff --git a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
index 1944fb13a1a3584b17bb2c5fd16e8dd1f613f615..079ea1cce8ba402015c6d1b1cb4a63e4cd500565 100644
--- a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- incident_management_incident_created
diff --git a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
index 22ed6967e32648c6098f2cc45e3aa55bc6f25855..cfb5627edac1f19ae3160670ac27bf40fb122281 100644
--- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_project_management_issue_title_changed
diff --git a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
index 9ecfd9625d6e365f5d3e403948838f3781d0bc21..74610e63be0be5cef9ad225c2a6669017724cf63 100644
--- a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
@@ -15,7 +15,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_search_total
diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index 77b94b5ae13c74c5f633c02d632b29c0f041fb8f..fe664c6d612de49f335d4c9ad3c76bf469f206ca 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -14,7 +14,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_code_review_click_diff_view_setting
diff --git a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
index 08e948b459e542360583947ef3a73090a61eeab7..c151f8ed4355b656185113cc745b4daa99572083 100644
--- a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_quickactions_approve
diff --git a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
index fc91d67a000f901aa5a5ec02501f701a2e63bbb5..ab7800d2a3767b434d5acb2847a49b16ce0c1973 100644
--- a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
@@ -13,7 +13,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_package_composer_deploy_token
diff --git a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
index 9df57f31c41e85f15490e26a0c282fa270a02631..7f7d4dd1519654783a926b98ea0b6f9afce4c2c5 100644
--- a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_package_composer_user
diff --git a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
index 8bd708b96e2a66a95bcf06709092cf5e1db906af..fa7cfb97bb2618fa7ce59fa4a69467e3852f2bc0 100644
--- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_ecosystem_jira_service_close_issue
diff --git a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
index eeffe48b2565e0ef12dbe813c6d6f53b9817d1c2..9251e4c9ddf1d5bd6f4a672b51fd7aee99e8ceb4 100644
--- a/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427102618_code_review_category_monthly_active_users.yml
@@ -23,7 +23,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'i_code_review_user_single_file_diffs'
diff --git a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
index f61e065033a522ba89a1df34799f0a6d914452af..ca2c3bcc6b63b6567bf63d2f2da86734b42fb2c8 100644
--- a/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103010_code_review_extension_category_monthly_active_users.yml
@@ -14,7 +14,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'i_code_review_user_vs_code_api_request'
diff --git a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
index 36115c9bcc2742f20ea90e196a7f8eade195c73d..c2f25aa2dd7d2c818ac10e9a9880699928e3f3ae 100644
--- a/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_28d/20210427103119_code_review_group_monthly_active_users.yml
@@ -22,7 +22,6 @@ time_frame: 28d
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'i_code_review_user_single_file_diffs'
diff --git a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
index be9f6bdb94cf8721aecef960c78973961a4e69d9..d011fea6e32de56d0fc6759003bcf05810e8417f 100644
--- a/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210427105033_pipeline_authoring_total_unique_counts_monthly.yml
@@ -14,7 +14,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- o_pipeline_authoring_unique_users_committing_ciconfigfile
diff --git a/config/metrics/counts_28d/20220222215951_xmau_plan.yml b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
index 07de21168a8b144095a61b2a0d9ed1641691d5f6..c70e1049ceb9bbcfeb46300f01914f86cac217a1 100644
--- a/config/metrics/counts_28d/20220222215951_xmau_plan.yml
+++ b/config/metrics/counts_28d/20220222215951_xmau_plan.yml
@@ -13,7 +13,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_creating_work_items
diff --git a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
index 9a9efa99c37c3483cfe540dd390ec409f31584f4..f883ce6c3f424190f83042ec9d8abdb4add47b88 100644
--- a/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
+++ b/config/metrics/counts_28d/20220222215952_xmau_project_management.yml
@@ -13,7 +13,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_creating_work_items
diff --git a/config/metrics/counts_28d/20220222215955_users_work_items.yml b/config/metrics/counts_28d/20220222215955_users_work_items.yml
index ac7f7b48e5cc018351256ba96b8b77cbe523fd71..0fdadf16358367974367a11689b84247a7ad6834 100644
--- a/config/metrics/counts_28d/20220222215955_users_work_items.yml
+++ b/config/metrics/counts_28d/20220222215955_users_work_items.yml
@@ -13,7 +13,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_creating_work_items
diff --git a/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
index ec083e28beee7cc3858f3aaf80b359a69f1bb90e..23651a782231b323831edc1c36beec0eb92bf93e 100644
--- a/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20220315223227_error_tracking_total_unique_counts_monthly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- error_tracking_view_list
diff --git a/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
index b3420789426f08e2b68a196330a7cc9cf5c05c94..7079d0cbb4f14b0c5d822abd59d78b51dbbe3f37 100644
--- a/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20220615103718_incident_management_timeline_event_total_unique_counts_monthly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- incident_management_timeline_event_created
diff --git a/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml b/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml
index 6cfede35f9314bf7498310ad3d2ee9ea65784ee8..e5d9a4230bfb063fa2ba11523946ed4544ece5d1 100644
--- a/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml
+++ b/config/metrics/counts_28d/20230112174745_i_testing_active_user_monthly.yml
@@ -14,7 +14,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'i_testing_test_report_uploaded'
diff --git a/config/metrics/counts_28d/20230417064258_i_container_registry_writes_user_monthly.yml b/config/metrics/counts_28d/20230417064258_i_container_registry_writes_user_monthly.yml
index ba8507dcc2523a0ab6d832bf22e1d2d0ce6aff2e..a777e8dfb80176b87a82541eb26c88494ffd441c 100644
--- a/config/metrics/counts_28d/20230417064258_i_container_registry_writes_user_monthly.yml
+++ b/config/metrics/counts_28d/20230417064258_i_container_registry_writes_user_monthly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_container_registry_push_tag_user
diff --git a/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
index 29953ab7de19a8e5bb33446bcab902854b64e396..890d7c6f75608fcfe7e96e7d562d158bb09b0ca5 100644
--- a/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
+++ b/config/metrics/counts_7d/20210216174908_analytics_unique_visits_for_any_target.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_viewing_analytics_group_devops_adoption
diff --git a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
index 9745abf5408fdc1ce97299d78aa65fe52a7c93ed..193f528301fba520355228de23b606bb98991282 100644
--- a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_viewing_analytics_group_devops_adoption
diff --git a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
index 035c17faef5e23dfee10fdd4da202bf56b0096a8..c281fc1deee94420f41de465c0cfce67d8752c26 100644
--- a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
@@ -12,7 +12,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_edit_by_web_ide
diff --git a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
index 446ce10f04fe9baf4ba5296dd479c9ea736d3257..8631b12f35c9e602ec6e58ea8dc687479241af9c 100644
--- a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_search_total
diff --git a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
index 6619f3b589b159229ee5136a2962bc13ad119da8..479ae04536e4a8088384c2979ff21efb0872540c 100644
--- a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
@@ -12,7 +12,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'incident_management_alert_status_changed'
diff --git a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
index 206d60d0d5faf3cf510234a224c6b1f3144634e5..612a461f733c669b178531321cfcce0b046db219 100644
--- a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
@@ -12,7 +12,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'incident_management_incident_created'
diff --git a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
index 85180fbfe5df3379ee88f47d5479d5a7f81c3c01..ae7658e877200f7ad58f4eb197e6d1330e220f2e 100644
--- a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- incident_management_incident_created
diff --git a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
index a6fc0ddb08675c84c1fc12bdea6b3b000d93c70f..b67aad5ea84b08a9a134cfdc8249d8042c15ce03 100644
--- a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_project_management_issue_title_changed
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index 4f84f5b26b5cb94c1f821be8a55936ff9912905f..e6161f2eea800c04e18d4c77bcb69c6587f1f0de 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -14,7 +14,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_code_review_click_diff_view_setting
diff --git a/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
index 0ed0342d8edf76ec6a7c89eefc127138b990c93f..cacdba1533286119abc58c1e30078fd4ab668c84 100644
--- a/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_quickactions_approve
diff --git a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
index e0e7ebd62aefcf9572358567a3d976ccde1d33e0..c9efe02314f74c230af75eebb82323be9ea1d439 100644
--- a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -13,7 +13,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_package_composer_deploy_token
diff --git a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
index e37f6d279194df241be99c1abbc562b15a14ca38..f698c2b92c03246f94b3acadfe9be963e26eb958 100644
--- a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_package_composer_user
diff --git a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
index eb25f3a384571884e3b34228c40afc289a6c2d90..8f6834fb5b41b2f6e0c0d3014bd9e96d60eec309 100644
--- a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
@@ -12,7 +12,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_ecosystem_jira_service_close_issue
diff --git a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
index f159184503cf5b93298740dfa57af21dd2fb796b..96c9d8080bdd914338481e16d5279642c0668dbe 100644
--- a/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103328_code_review_group_monthly_active_users.yml
@@ -20,7 +20,6 @@ time_frame: 7d
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'i_code_review_user_single_file_diffs'
diff --git a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
index 0b93ea59c3ca02425045ac4336abf416db125bbb..798a35d6ad97002b17357936d6b5542a9d856d48 100644
--- a/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103407_code_review_category_monthly_active_users.yml
@@ -21,7 +21,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'i_code_review_user_single_file_diffs'
diff --git a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
index 7b1d58caecae44c7d502af0a287b1e2e92c06d54..3fed154758499bf24e12a7cbbf213e6d0735ab0a 100644
--- a/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
+++ b/config/metrics/counts_7d/20210427103452_code_review_extension_category_monthly_active_users.yml
@@ -14,7 +14,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'i_code_review_user_vs_code_api_request'
diff --git a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
index 77bbceb7428a45e823ebe7bf9c79feb5182f9874..cfff6835448266d9b0311e34991c59a4e064455c 100644
--- a/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210427105030_pipeline_authoring_total_unique_counts_weekly.yml
@@ -14,7 +14,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- o_pipeline_authoring_unique_users_committing_ciconfigfile
diff --git a/config/metrics/counts_7d/20220222215851_xmau_plan.yml b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
index 733bcbd9fe242354e6d005728cfc7e13bef4971d..5b2e68ebc2def5f872ada46e0119270afac8cf2e 100644
--- a/config/metrics/counts_7d/20220222215851_xmau_plan.yml
+++ b/config/metrics/counts_7d/20220222215851_xmau_plan.yml
@@ -13,7 +13,6 @@ data_source: redis_hll
time_frame: 7d
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_creating_work_items
diff --git a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
index 7d3d60687997e3675437fb3fa70a1b9aed235cf6..ede9cdf674899430aea5dae75654e5b89eab9bbf 100644
--- a/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
+++ b/config/metrics/counts_7d/20220222215852_xmau_project_management.yml
@@ -13,7 +13,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_creating_work_items
diff --git a/config/metrics/counts_7d/20220222215855_users_work_items.yml b/config/metrics/counts_7d/20220222215855_users_work_items.yml
index eca52ec63ca96cc5d22cf565f1bf08fa56bfb085..c427621b8bbce3fc44add6444cfb3c9005dc9c52 100644
--- a/config/metrics/counts_7d/20220222215855_users_work_items.yml
+++ b/config/metrics/counts_7d/20220222215855_users_work_items.yml
@@ -13,7 +13,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_creating_work_items
diff --git a/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
index 3cdbd2976e08eb8fd5cf42fbb9c01f7beb0153b3..66941fff0c4fbed4f018b777727074fa82b405d2 100644
--- a/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20220315223220_error_tracking_total_unique_counts_weekly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- error_tracking_view_list
diff --git a/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
index da73a2b5412e2f673273a06fa3050f52dd82dc00..cdc519af07ca20c7fa9658cff106bfd4657f8381 100644
--- a/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20220615103711_incident_management_timeline_event_total_unique_counts_weekly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- incident_management_timeline_event_created
diff --git a/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml b/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml
index b3b80ca1c9842fb0e3262d5487019d4838f7c76b..ae4e0c2bc67262ad1a103e1151701e6d2aaccc5f 100644
--- a/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml
+++ b/config/metrics/counts_7d/20230112174745_i_testing_active_user_weekly.yml
@@ -14,7 +14,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'i_testing_test_report_uploaded'
diff --git a/config/metrics/counts_7d/20230417063146_i_container_registry_writes_user_weekly.yml b/config/metrics/counts_7d/20230417063146_i_container_registry_writes_user_weekly.yml
index 4a8eb357a7d44d9ab5c0e6c99dbf20a257d6a495..c0e55737cf73490eff3e3babb8420ddb0ec8e527 100644
--- a/config/metrics/counts_7d/20230417063146_i_container_registry_writes_user_weekly.yml
+++ b/config/metrics/counts_7d/20230417063146_i_container_registry_writes_user_weekly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_container_registry_push_tag_user
diff --git a/config/metrics/schema/redis_hll.json b/config/metrics/schema/redis_hll.json
index a70c0f3a8a7c048f944b5c11f76eaabd9916ef32..196641fbc4885949a838299f2ebaa66dcd1eaa33 100644
--- a/config/metrics/schema/redis_hll.json
+++ b/config/metrics/schema/redis_hll.json
@@ -50,12 +50,6 @@
"aggregate": {
"type": "object",
"properties": {
- "operator": {
- "enum": [
- "OR",
- "AND"
- ]
- },
"attribute": {
"enum": [
"user_id",
@@ -64,7 +58,6 @@
}
},
"required": [
- "operator",
"attribute"
],
"additionalProperties": false
diff --git a/doc/development/internal_analytics/metrics/metrics_instrumentation.md b/doc/development/internal_analytics/metrics/metrics_instrumentation.md
index df8e8f31f9de4a45e3983b260de091508939294d..328a9fbe49eb11284c3b2215936582e1727a021a 100644
--- a/doc/development/internal_analytics/metrics/metrics_instrumentation.md
+++ b/doc/development/internal_analytics/metrics/metrics_instrumentation.md
@@ -253,9 +253,6 @@ You can use a YAML file to define your aggregated metrics. The following argumen
use the same data source. Additional data source requirements are described in
[Database sourced aggregated metrics](#database-sourced-aggregated-metrics) and
[Event sourced aggregated metrics](#event-sourced-aggregated-metrics).
-- `options.aggregate.operator`: Operator that defines how the aggregated metric data is counted. Available operators are:
- - `OR`: Removes duplicates and counts all entries that triggered any of the listed events.
- - `AND`: Removes duplicates and counts all elements that were observed triggering all of the following events.
- `options.aggregate.attribute`: Information pointing to the attribute that is being aggregated across events.
- `time_frame`: One or more valid time frames. Use these to limit the data included in aggregated metrics to events within a specific date-range. Valid time frames are:
- `7d`: The last 7 days of data.
@@ -277,7 +274,6 @@ instrumentation_class: AggregatedMetric
data_source: internal_events
options:
aggregate:
- operator: OR
attribute: user_id
events:
- `incident_management_alert_status_changed`
@@ -384,7 +380,6 @@ instrumentation_class: MergeUsageCountAggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- `incident_management_alert_status_changed`
diff --git a/ee/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml b/ee/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
index 8af830d1ff3918f2f541c99fc4bdaf435c40e817..d2e576d145e8a46c41d3e536b436d40fc26bcd01 100644
--- a/ee/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
+++ b/ee/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
@@ -13,7 +13,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'g_compliance_audit_events'
diff --git a/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml b/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
index c527e272692196a1bec7649fb9093b3ae2c8de3e..ef4487dcf6053e8c9a5ffbad808ff16e2aea82b6 100644
--- a/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
+++ b/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
@@ -13,7 +13,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'i_testing_full_code_quality_report_total'
diff --git a/ee/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml b/ee/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
index 8ca89e218c1b590575c2da40ca3b6c8538492dd8..a91d89547dde8abb8e83be971fcf22fe212afb59 100644
--- a/ee/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
@@ -13,7 +13,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_compliance_dashboard
diff --git a/ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml b/ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
index fb0dc8f6ddc20b86b7b7e37a1edf5ebc929085ba..202a3b0d9c7a5c3eb75ec19741fc6e6b609810b8 100644
--- a/ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
@@ -13,7 +13,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_compliance_dashboard
diff --git a/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml b/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml
index 577bc411a51d0f37c21875831876576f9ed11be4..5c9053eff32467d148ef5b04bc7d704caa51b781 100644
--- a/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210318183733_epics_usage_total_unique_counts_monthly.yml
@@ -14,7 +14,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_project_management_epic_created
diff --git a/ee/config/metrics/counts_28d/20210507171840_epic_boards_usage_total_unique_counts_monthly.yml b/ee/config/metrics/counts_28d/20210507171840_epic_boards_usage_total_unique_counts_monthly.yml
index d3a83f8cf401d5c24d02385c56713c91cbdf6041..8a8cf0b434d04a358f2051e6cfee861ad8760e7b 100644
--- a/ee/config/metrics/counts_28d/20210507171840_epic_boards_usage_total_unique_counts_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210507171840_epic_boards_usage_total_unique_counts_monthly.yml
@@ -13,7 +13,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_project_management_users_creating_epic_boards
diff --git a/ee/config/metrics/counts_28d/20220803103446_issuable_resource_links_total_unique_counts_monthly.yml b/ee/config/metrics/counts_28d/20220803103446_issuable_resource_links_total_unique_counts_monthly.yml
index 4fa2ecbbbe45c4a5fe022c204b85bf3aaf21e2ce..9cc22c259db0498b0f0c3da93d98c770383ff584 100644
--- a/ee/config/metrics/counts_28d/20220803103446_issuable_resource_links_total_unique_counts_monthly.yml
+++ b/ee/config/metrics/counts_28d/20220803103446_issuable_resource_links_total_unique_counts_monthly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- incident_management_issuable_resource_link_created
diff --git a/ee/config/metrics/counts_28d/20230807111737_users_visiting_govern_pages_monthly.yml b/ee/config/metrics/counts_28d/20230807111737_users_visiting_govern_pages_monthly.yml
index 14cdc8fa79825b83075301803aa2101f1158a974..e9b02206e334c91a722671c2890a6af79e05ab8c 100644
--- a/ee/config/metrics/counts_28d/20230807111737_users_visiting_govern_pages_monthly.yml
+++ b/ee/config/metrics/counts_28d/20230807111737_users_visiting_govern_pages_monthly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_code_review_merge_request_widget_security_reports_expand
diff --git a/ee/config/metrics/counts_28d/20230807121101_users_visiting_security_policies_pages_monthly.yml b/ee/config/metrics/counts_28d/20230807121101_users_visiting_security_policies_pages_monthly.yml
index 1a3d14ef770b115ccb769019abab8f5b65d58d63..6d56e18f7194a245ec3da95d3d91351929e85e90 100644
--- a/ee/config/metrics/counts_28d/20230807121101_users_visiting_security_policies_pages_monthly.yml
+++ b/ee/config/metrics/counts_28d/20230807121101_users_visiting_security_policies_pages_monthly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_visiting_security_policies
diff --git a/ee/config/metrics/counts_28d/20230815130614_users_visiting_vulnerability_management_pages_monthly.yml b/ee/config/metrics/counts_28d/20230815130614_users_visiting_vulnerability_management_pages_monthly.yml
index 1c2214a86c29376c0e8fa6a1037a869e01b15939..94d102c25fc46952d19f1671c8cfb33d14f1f39a 100644
--- a/ee/config/metrics/counts_28d/20230815130614_users_visiting_vulnerability_management_pages_monthly.yml
+++ b/ee/config/metrics/counts_28d/20230815130614_users_visiting_vulnerability_management_pages_monthly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_visiting_security_vulnerability_report
diff --git a/ee/config/metrics/counts_28d/20230815131036_users_visiting_dependency_management_pages_monthly.yml b/ee/config/metrics/counts_28d/20230815131036_users_visiting_dependency_management_pages_monthly.yml
index 8382a731cda9e505c860559fe391df27bbab2924..a0d06647f68216b8725ee2c6b31679ecd5ae0f82 100644
--- a/ee/config/metrics/counts_28d/20230815131036_users_visiting_dependency_management_pages_monthly.yml
+++ b/ee/config/metrics/counts_28d/20230815131036_users_visiting_dependency_management_pages_monthly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_visiting_dependencies
diff --git a/ee/config/metrics/counts_28d/20230815131251_users_visiting_threat_insights_pages_monthly.yml b/ee/config/metrics/counts_28d/20230815131251_users_visiting_threat_insights_pages_monthly.yml
index 6aa737b1e95576f254db0d83674999bd3844c73f..03c7d5e3ef0a84c1241ab6c78cd17ca1be4f45e8 100644
--- a/ee/config/metrics/counts_28d/20230815131251_users_visiting_threat_insights_pages_monthly.yml
+++ b/ee/config/metrics/counts_28d/20230815131251_users_visiting_threat_insights_pages_monthly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_visiting_security_vulnerability_report
diff --git a/ee/config/metrics/counts_28d/20231023133430_users_visiting_compliance_pages_monthly.yml b/ee/config/metrics/counts_28d/20231023133430_users_visiting_compliance_pages_monthly.yml
index 6eebdc6625802e96438235de81116a3a94cb8781..3b38bbc923fbb0c251ad337713a55ae8a96b3214 100644
--- a/ee/config/metrics/counts_28d/20231023133430_users_visiting_compliance_pages_monthly.yml
+++ b/ee/config/metrics/counts_28d/20231023133430_users_visiting_compliance_pages_monthly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_compliance_dashboard
diff --git a/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml b/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml
index 058b61f4f7b559d73d089818da3a787f09351186..146d8b167347bf7c1307dbedba25bf97e4e4f2cb 100644
--- a/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml
+++ b/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml
@@ -13,7 +13,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'g_compliance_audit_events'
diff --git a/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml b/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml
index faa2309574611476fafb4ec2a2327fd2db06ff1f..1d145ee3bd468aea8b0bfc18818ddc09598476a8 100644
--- a/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml
+++ b/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml
@@ -13,7 +13,6 @@ instrumentation_class: AggregatedMetric
data_source: redis_hll
options:
aggregate:
- operator: OR
attribute: user_id
events:
- 'i_testing_full_code_quality_report_total'
diff --git a/ee/config/metrics/counts_7d/20210216183914_compliance_unique_visits_for_any_target.yml b/ee/config/metrics/counts_7d/20210216183914_compliance_unique_visits_for_any_target.yml
index cedc2b288614b433c48c574843b32b0a6111dd6e..fe4d8de7f35d4e507b475515d8bbd4b6e8979194 100644
--- a/ee/config/metrics/counts_7d/20210216183914_compliance_unique_visits_for_any_target.yml
+++ b/ee/config/metrics/counts_7d/20210216183914_compliance_unique_visits_for_any_target.yml
@@ -13,7 +13,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_compliance_dashboard
diff --git a/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml b/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml
index 36279508f0ccd7f87f4b88e49890b671f8329f84..42060bd5c6bf7a3320836da465da7bd69c4fba94 100644
--- a/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml
@@ -15,7 +15,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_search_total
diff --git a/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml
index 265a5c9fa490a2cc914bc3552f0870533fcc0bee..a853964071f6e45b7b589f48d5f2853b003e2a18 100644
--- a/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml
@@ -13,7 +13,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_compliance_dashboard
diff --git a/ee/config/metrics/counts_7d/20210318183220_epics_usage_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210318183220_epics_usage_total_unique_counts_weekly.yml
index e24c1a5286fb5777d7d005b13b57de0829041d6c..0636ab2507811b4d3b6b461351bae8fba82aa282 100644
--- a/ee/config/metrics/counts_7d/20210318183220_epics_usage_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210318183220_epics_usage_total_unique_counts_weekly.yml
@@ -14,7 +14,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_project_management_epic_created
diff --git a/ee/config/metrics/counts_7d/20210507171838_epic_boards_usage_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210507171838_epic_boards_usage_total_unique_counts_weekly.yml
index e6b2d4e7054f896f3c4c0a2e6db9123106ff1afb..5a8ffe409e04b855c58beb165a6c45241dd2ce30 100644
--- a/ee/config/metrics/counts_7d/20210507171838_epic_boards_usage_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210507171838_epic_boards_usage_total_unique_counts_weekly.yml
@@ -13,7 +13,6 @@ data_source: redis_hll
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_project_management_users_creating_epic_boards
diff --git a/ee/config/metrics/counts_7d/20220803103442_issuable_resource_links_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20220803103442_issuable_resource_links_total_unique_counts_weekly.yml
index ef7b1ae64dd077ea0f45536e7ede9401e88eb93f..d1940ee81de43cb6f17948cab07bb381e5d317c8 100644
--- a/ee/config/metrics/counts_7d/20220803103442_issuable_resource_links_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20220803103442_issuable_resource_links_total_unique_counts_weekly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- incident_management_issuable_resource_link_created
diff --git a/ee/config/metrics/counts_7d/20230807111736_users_visiting_govern_pages_weekly.yml b/ee/config/metrics/counts_7d/20230807111736_users_visiting_govern_pages_weekly.yml
index fed4ce4bca2efdd850f681a5068a6990f500b6d4..3ede5e9eb75cff4ac7140a9ee817dfb16119bcf2 100644
--- a/ee/config/metrics/counts_7d/20230807111736_users_visiting_govern_pages_weekly.yml
+++ b/ee/config/metrics/counts_7d/20230807111736_users_visiting_govern_pages_weekly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- i_code_review_merge_request_widget_security_reports_expand
diff --git a/ee/config/metrics/counts_7d/20230807121101_users_visiting_security_policies_pages_weekly.yml b/ee/config/metrics/counts_7d/20230807121101_users_visiting_security_policies_pages_weekly.yml
index 3e59da2f34462c8d08a0c41acbd31f63d86dd8df..502f84feaa7e1a41c84e3eddb03e8a630361a8c5 100644
--- a/ee/config/metrics/counts_7d/20230807121101_users_visiting_security_policies_pages_weekly.yml
+++ b/ee/config/metrics/counts_7d/20230807121101_users_visiting_security_policies_pages_weekly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_visiting_security_policies
diff --git a/ee/config/metrics/counts_7d/20230815130614_users_visiting_vulnerability_management_pages_weekly.yml b/ee/config/metrics/counts_7d/20230815130614_users_visiting_vulnerability_management_pages_weekly.yml
index 3c57d61a6e3dcbf440abfdedb2695e7fef23aac2..b86e1f7bcd31da395a8462e673671a075bc2a79c 100644
--- a/ee/config/metrics/counts_7d/20230815130614_users_visiting_vulnerability_management_pages_weekly.yml
+++ b/ee/config/metrics/counts_7d/20230815130614_users_visiting_vulnerability_management_pages_weekly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_visiting_security_vulnerability_report
diff --git a/ee/config/metrics/counts_7d/20230815131036_users_visiting_dependency_management_pages_weekly.yml b/ee/config/metrics/counts_7d/20230815131036_users_visiting_dependency_management_pages_weekly.yml
index 1e47123e44bff2d9d92e402e4007e7cab893bc9f..e5f4f93067922497e3256e2660cfc348b70739a1 100644
--- a/ee/config/metrics/counts_7d/20230815131036_users_visiting_dependency_management_pages_weekly.yml
+++ b/ee/config/metrics/counts_7d/20230815131036_users_visiting_dependency_management_pages_weekly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_visiting_dependencies
diff --git a/ee/config/metrics/counts_7d/20230815131251_users_visiting_threat_insights_pages_weekly.yml b/ee/config/metrics/counts_7d/20230815131251_users_visiting_threat_insights_pages_weekly.yml
index e84a4681b33cac3d7b08cf1beba9d1218e968f0d..2cd64ee8d3c3a9a8b18d5e2c7f9d654de4488347 100644
--- a/ee/config/metrics/counts_7d/20230815131251_users_visiting_threat_insights_pages_weekly.yml
+++ b/ee/config/metrics/counts_7d/20230815131251_users_visiting_threat_insights_pages_weekly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- users_visiting_security_vulnerability_report
diff --git a/ee/config/metrics/counts_7d/20231023133430_users_visiting_compliance_pages_weekly.yml b/ee/config/metrics/counts_7d/20231023133430_users_visiting_compliance_pages_weekly.yml
index 3389ec24ca1798ac58b59575769efedf0d37863f..e9f19a8e2e69db4b11acb4740e9b9a08a170b726 100644
--- a/ee/config/metrics/counts_7d/20231023133430_users_visiting_compliance_pages_weekly.yml
+++ b/ee/config/metrics/counts_7d/20231023133430_users_visiting_compliance_pages_weekly.yml
@@ -14,7 +14,6 @@ data_category: optional
instrumentation_class: AggregatedMetric
options:
aggregate:
- operator: OR
attribute: user_id
events:
- g_compliance_dashboard
diff --git a/spec/lib/gitlab/usage/metric_definition_spec.rb b/spec/lib/gitlab/usage/metric_definition_spec.rb
index caa114cb00fce774f2aab9614b09bbc7901d204f..7c65175b2d3581cf6b5ba85a4d9ce8cd5feacfe1 100644
--- a/spec/lib/gitlab/usage/metric_definition_spec.rb
+++ b/spec/lib/gitlab/usage/metric_definition_spec.rb
@@ -308,20 +308,18 @@ def write_metric(metric, path, content)
'RedisHLLMetric' | { events: [2] } | false
'RedisHLLMetric' | { events: 'a' } | false
'RedisHLLMetric' | { event: ['a'] } | false
- 'AggregatedMetric' | { aggregate: { operator: 'OR', attribute: 'user_id' }, events: ['a'] } | true
- 'AggregatedMetric' | { aggregate: { operator: 'AND', attribute: 'project_id' }, events: %w[b c] } | true
+ 'AggregatedMetric' | { aggregate: { attribute: 'user_id' }, events: ['a'] } | true
+ 'AggregatedMetric' | { aggregate: { attribute: 'project_id' }, events: %w[b c] } | true
'AggregatedMetric' | nil | false
'AggregatedMetric' | {} | false
- 'AggregatedMetric' | { aggregate: { operator: 'OR', attribute: 'user_id' }, events: ['a'], event: 'a' } | false
- 'AggregatedMetric' | { aggregate: { operator: 'OR', attribute: 'user_id' } } | false
+ 'AggregatedMetric' | { aggregate: { attribute: 'user_id' }, events: ['a'], event: 'a' } | false
+ 'AggregatedMetric' | { aggregate: { attribute: 'user_id' } } | false
'AggregatedMetric' | { events: ['a'] } | false
- 'AggregatedMetric' | { aggregate: { operator: 'OR', attribute: 'user_id' }, events: 'a' } | false
+ 'AggregatedMetric' | { aggregate: { attribute: 'user_id' }, events: 'a' } | false
'AggregatedMetric' | { aggregate: 'a', events: ['a'] } | false
- 'AggregatedMetric' | { aggregate: { operator: 'OR' }, events: ['a'] } | false
- 'AggregatedMetric' | { aggregate: { attribute: 'user_id' }, events: ['a'] } | false
- 'AggregatedMetric' | { aggregate: { operator: 'OR', attribute: 'user_id', a: 'b' }, events: ['a'] } | false
- 'AggregatedMetric' | { aggregate: { operator: '???', attribute: 'user_id' }, events: ['a'] } | false
- 'AggregatedMetric' | { aggregate: { operator: 'OR', attribute: ['user_id'] }, events: ['a'] } | false
+ 'AggregatedMetric' | { aggregate: {}, events: ['a'] } | false
+ 'AggregatedMetric' | { aggregate: { attribute: 'user_id', a: 'b' }, events: ['a'] } | false
+ 'AggregatedMetric' | { aggregate: { attribute: ['user_id'] }, events: ['a'] } | false
end
with_them do