diff options
Diffstat (limited to 'lib/generators/gitlab')
3 files changed, 8 insertions, 14 deletions
diff --git a/lib/generators/gitlab/analytics/internal_events_generator.rb b/lib/generators/gitlab/analytics/internal_events_generator.rb index ae738c5dcb0..083d5c31c9b 100644 --- a/lib/generators/gitlab/analytics/internal_events_generator.rb +++ b/lib/generators/gitlab/analytics/internal_events_generator.rb @@ -87,9 +87,11 @@ module Gitlab def create_metric_file validate! - template "event_definition.yml", - event_file_path(event), - ask_description(event, "event", "what the event is supposed to track, where, and when") + unless event_exists? + template "event_definition.yml", + event_file_path(event), + ask_description(event, "event", "what the event is supposed to track, where, and when") + end time_frames.each do |time_frame| template "metric_definition.yml", @@ -106,12 +108,6 @@ module Gitlab private - def known_event_entry - <<~YML - - name: #{event} - YML - end - def event_identifiers return unless include_default_event_properties? @@ -190,8 +186,6 @@ module Gitlab end def validate! - raise "An event '#{event}' already exists" if event_exists? - validate_tiers! %i[unique event mr section stage group].each do |option| diff --git a/lib/generators/gitlab/usage_metric_definition_generator.rb b/lib/generators/gitlab/usage_metric_definition_generator.rb index cdbfda2495b..5fe0ab1364d 100644 --- a/lib/generators/gitlab/usage_metric_definition_generator.rb +++ b/lib/generators/gitlab/usage_metric_definition_generator.rb @@ -26,7 +26,7 @@ module Gitlab TOP_LEVEL_DIR = 'config' TOP_LEVEL_DIR_EE = 'ee' - VALID_INPUT_DIRS = (TIME_FRAME_DIRS.flat_map { |d| [d.name, d.time_frame] } - %w(none)).freeze + VALID_INPUT_DIRS = (TIME_FRAME_DIRS.flat_map { |d| [d.name, d.time_frame] } - %w[none]).freeze source_root File.expand_path('../../../generator_templates/usage_metric_definition', __dir__) diff --git a/lib/generators/gitlab/usage_metric_generator.rb b/lib/generators/gitlab/usage_metric_generator.rb index 3624a6eb5a7..bc9f33573af 100644 --- a/lib/generators/gitlab/usage_metric_generator.rb +++ b/lib/generators/gitlab/usage_metric_generator.rb @@ -16,8 +16,8 @@ module Gitlab numbers: 'Numbers' }.freeze - ALLOWED_DATABASE_OPERATIONS = %w(count distinct_count estimate_batch_distinct_count sum average).freeze - ALLOWED_NUMBERS_OPERATIONS = %w(add).freeze + ALLOWED_DATABASE_OPERATIONS = %w[count distinct_count estimate_batch_distinct_count sum average].freeze + ALLOWED_NUMBERS_OPERATIONS = %w[add].freeze ALLOWED_OPERATIONS = ALLOWED_DATABASE_OPERATIONS | ALLOWED_NUMBERS_OPERATIONS source_root File.expand_path('usage_metric/templates', __dir__) |