From 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 19 May 2021 15:44:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-12-stable-ee

---
 .../snowplow_event_definition/event_definition.yml | 28 ++++++++++++++++++++++
 .../usage_metric_definition/metric_definition.yml  |  6 ++---
 2 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 generator_templates/snowplow_event_definition/event_definition.yml

(limited to 'generator_templates')

diff --git a/generator_templates/snowplow_event_definition/event_definition.yml b/generator_templates/snowplow_event_definition/event_definition.yml
new file mode 100644
index 00000000000..31489bfc1ea
--- /dev/null
+++ b/generator_templates/snowplow_event_definition/event_definition.yml
@@ -0,0 +1,28 @@
+---
+description:
+category: <%= event_category %>
+action: <%= event_action %>
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:
+#- project
+#- user
+#- namespace
+product_section:
+product_stage:
+product_group:
+product_category:
+milestone: "<%= milestone %>"
+introduced_by_url:
+distributions:
+<%= distributions %>
+tiers: <% if ee? %>
+#- premium
+- ultimate
+<% else %>
+- free
+- premium
+- ultimate
+<% end %>
diff --git a/generator_templates/usage_metric_definition/metric_definition.yml b/generator_templates/usage_metric_definition/metric_definition.yml
index 5e2ab095358..89290a0bd89 100644
--- a/generator_templates/usage_metric_definition/metric_definition.yml
+++ b/generator_templates/usage_metric_definition/metric_definition.yml
@@ -13,7 +13,5 @@ time_frame: <%= time_frame %>
 data_source:
 distribution:
 <%= distribution %>
-# tier:
-# - free
-# - premium
-# - ultimate
+tier:
+<%= tier %>
-- 
cgit v1.2.3