diff options
Diffstat (limited to 'lib/generators')
4 files changed, 3 insertions, 17 deletions
diff --git a/lib/generators/batched_background_migration/templates/batched_background_migration_job.template b/lib/generators/batched_background_migration/templates/batched_background_migration_job.template index c57ac637cb8..bfcd36a0df9 100644 --- a/lib/generators/batched_background_migration/templates/batched_background_migration_job.template +++ b/lib/generators/batched_background_migration/templates/batched_background_migration_job.template @@ -8,7 +8,7 @@ module Gitlab module BackgroundMigration class <%= class_name %> < BatchedMigrationJob - # operation_name :my_operation + # operation_name :my_operation # This is used as the key on collecting metrics # scope_to ->(relation) { relation.where(column: "value") } feature_category :<%= feature_category %> diff --git a/lib/generators/batched_background_migration/templates/ee_batched_background_migration_job.template b/lib/generators/batched_background_migration/templates/ee_batched_background_migration_job.template index b36fc216acd..b450d567203 100644 --- a/lib/generators/batched_background_migration/templates/ee_batched_background_migration_job.template +++ b/lib/generators/batched_background_migration/templates/ee_batched_background_migration_job.template @@ -13,7 +13,7 @@ module EE extend ::Gitlab::Utils::Override prepended do - # operation_name :my_operation + # operation_name :my_operation # This is used as the key on collecting metrics # scope_to ->(relation) { relation.where(column: "value") } end diff --git a/lib/generators/gitlab/analytics/internal_events_generator.rb b/lib/generators/gitlab/analytics/internal_events_generator.rb index d4c3a10c00e..ae738c5dcb0 100644 --- a/lib/generators/gitlab/analytics/internal_events_generator.rb +++ b/lib/generators/gitlab/analytics/internal_events_generator.rb @@ -31,8 +31,6 @@ module Gitlab TOP_LEVEL_DIR = 'config' TOP_LEVEL_DIR_EE = 'ee' DESCRIPTION_MIN_LENGTH = 50 - KNOWN_EVENTS_PATH = 'lib/gitlab/usage_data_counters/known_events/common.yml' - KNOWN_EVENTS_PATH_EE = 'ee/lib/ee/gitlab/usage_data_counters/known_events/common.yml' DESCRIPTION_INQUIRY = %( Please describe in at least #{DESCRIPTION_MIN_LENGTH} characters @@ -43,7 +41,7 @@ module Gitlab source_root File.expand_path('../../../../generator_templates/gitlab_internal_events', __dir__) - desc 'Generates metric definitions, event definition yml files and known events entries' + desc 'Generates metric definitions and event definition yml files' class_option :skip_namespace, hide: true @@ -104,9 +102,6 @@ module Gitlab "events, and event attributes in the description" ) end - - # ToDo: Delete during https://gitlab.com/groups/gitlab-org/-/epics/9542 cleanup - append_file known_events_file_name, known_event_entry end private @@ -194,12 +189,7 @@ module Gitlab path end - def known_events_file_name - (free? ? KNOWN_EVENTS_PATH : KNOWN_EVENTS_PATH_EE) - end - def validate! - raise "Required file: #{known_events_file_name} does not exists." unless File.exist?(known_events_file_name) raise "An event '#{event}' already exists" if event_exists? validate_tiers! diff --git a/lib/generators/gitlab/usage_metric_definition_generator.rb b/lib/generators/gitlab/usage_metric_definition_generator.rb index 4ddbe8b9f09..cdbfda2495b 100644 --- a/lib/generators/gitlab/usage_metric_definition_generator.rb +++ b/lib/generators/gitlab/usage_metric_definition_generator.rb @@ -73,10 +73,6 @@ module Gitlab private - def metric_name_suggestion(key_path) - "\nname: \"#{Usage::Metrics::NamesSuggestions::Generator.generate(key_path)}\"" - end - def file_path(key_path) path = File.join(TOP_LEVEL_DIR, 'metrics', directory&.name, "#{file_name(key_path)}.yml") path = File.join(TOP_LEVEL_DIR_EE, path) if ee? |