Merge branch 'am-improve-metrics-generator' into 'master'

Improve metrics generator

See merge request gitlab-org/gitlab!54064

doc/development/usage_ping/metrics_dictionary.md

@@ -59,8 +59,13 @@ introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1521
 product_group: group::product intelligence
 time_frame: none
 data_source: database
-distribution: [ee, ce]
-tier: ['free', 'starter', 'premium', 'ultimate', 'bronze', 'silver', 'gold']
+distribution:
+- ee
+- ce
+tier:
+- free
+- premium
+- ultimate
 ```
 
 ## Create a new metric definition

generator_templates/usage_metric_definition/metric_definition.yml

+---
 # See Usage Ping metrics dictionary docs https://docs.gitlab.com/ee/development/usage_ping/metrics_dictionary.html
 key_path: <%= key_path %>
 description:
@@ -7,10 +8,14 @@ product_group:
 product_category:
 value_type: <%= value_type %>
 status: implemented
-milestone:
+milestone: <%= milestone %>
 introduced_by_url:
 time_frame: <%= time_frame %>
 data_source:
-distribution: <%= distribution %>
-# tier: ['free', 'premium', 'ultimate']
-tier:
+distribution:
+<%= distribution %>
+# Add here corresponding tiers
+# tier:
+# - free
+# - premium
+# - ultimate

lib/generators/gitlab/usage_metric_definition_generator.rb

@@ -45,9 +45,13 @@ module Gitlab
     end
 
     def distribution
-      value = ['ce']
-      value << 'ee' if ee?
-      value
+      value = ['- ce']
+      value << '- ee' if ee?
+      value.join("\n")
+    end
+
+    def milestone
+      Gitlab::VERSION.match('(\d+\.\d+)').captures.first
     end
 
     private