Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 17 insertions, 0 deletions

diff --git a/lib/gitlab/usage_data_counters/aggregated_metrics/common.yml b/lib/gitlab/usage_data_counters/aggregated_metrics/common.yml
new file mode 100644
index 00000000000..97ec8423b95
--- /dev/null
+++ b/lib/gitlab/usage_data_counters/aggregated_metrics/common.yml
@@ -0,0 +1,17 @@
+#- name: unique name of aggregated metric
+#  operator: aggregation operator. Valid values are:
+#             - "OR": counts unique elements that were observed triggering any of following events
+#             - "AND": counts unique elements that were observed triggering all of following events
+#  events: list of events names to aggregate into metric. All events in this list must have the same 'redis_slot' and 'aggregation' attributes
+#           see from lib/gitlab/usage_data_counters/known_events/ for the list of valid events.
+#  feature_flag: name of development feature flag that will be checked before metrics aggregation is performed.
+#                Corresponding feature flag should have `default_enabled` attribute set to `false`.
+#                This attribute is OPTIONAL and can be omitted, when `feature_flag` is missing no feature flag will be checked.
+---
+- name: product_analytics_test_metrics_union
+  operator: OR
+  events: ['i_search_total', 'i_search_advanced', 'i_search_paid']
+  feature_flag: product_analytics_aggregated_metrics
+- name: product_analytics_test_metrics_intersection
+  operator: AND
+  events: ['i_search_total', 'i_search_advanced', 'i_search_paid']