Add latest changes from gitlab-org/gitlab@master

2 files changed, 18 insertions, 3 deletions

diff --git a/generator_templates/gitlab_internal_events/event_definition.yml b/generator_templates/gitlab_internal_events/event_definition.yml
new file mode 100644
index 00000000000..26adc55726e
--- /dev/null
+++ b/generator_templates/gitlab_internal_events/event_definition.yml
@@ -0,0 +1,16 @@
+---
+description: <%= args.last %>
+category: GitlabInternalEvents
+action: <%= event %>
+label_description:
+property_description:
+value_description:
+extra_properties:
+identifiers:<%= event_identifiers %>
+product_section: <%= options.fetch(:section) %>
+product_stage: <%= options.fetch(:stage) %>
+product_group: <%= options.fetch(:group) %>
+milestone: "<%= milestone %>"
+introduced_by_url: <%= options.fetch(:mr) %>
+distributions:<%= distributions %>
+tiers:<%= tiers %>
diff --git a/generator_templates/gitlab_internal_events/metric_definition.yml b/generator_templates/gitlab_internal_events/metric_definition.yml
index 88823355acc..c0ff71a09ce 100644
--- a/generator_templates/gitlab_internal_events/metric_definition.yml
+++ b/generator_templates/gitlab_internal_events/metric_definition.yml
@@ -1,6 +1,5 @@
 ---
 key_path: <%= args.second %>
-name: <%= args.second %>
 description: <%= args.last %>
 product_section: <%= options.fetch(:section) %>
 product_stage: <%= options.fetch(:stage) %>
@@ -14,5 +13,5 @@ time_frame: <%= args.third %>
 data_source: redis_hll
 data_category: optional
 instrumentation_class: <%= class_name %>
-<%= distribution %>
-<%= tier %>
+distribution: <%= distributions %>
+tier: <%= tiers %>