diff options
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/0_marginalia.rb | 7 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 9 |
2 files changed, 6 insertions, 10 deletions
diff --git a/config/initializers/0_marginalia.rb b/config/initializers/0_marginalia.rb index 952dd75886d..05893f29de9 100644 --- a/config/initializers/0_marginalia.rb +++ b/config/initializers/0_marginalia.rb @@ -4,11 +4,6 @@ require 'marginalia' ::Marginalia::Comment.extend(::Gitlab::Marginalia::Comment) -# Patch to modify 'Marginalia::ActiveRecordInstrumentation.annotate_sql' method with feature check. -# Orignal Marginalia::ActiveRecordInstrumentation is included to ActiveRecord::ConnectionAdapters::PostgreSQLAdapter in the Marginalia Railtie. -# Refer: https://github.com/basecamp/marginalia/blob/v1.8.0/lib/marginalia/railtie.rb#L67 -ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(Gitlab::Marginalia::ActiveRecordInstrumentation) - # By default, PostgreSQL only tracks the first 1024 bytes of a SQL # query. Prepending the comment allows us to trace the source of the # query without having to increase the `track_activity_query_size` @@ -25,5 +20,3 @@ Marginalia::Comment.components << :line if Rails.env.development? Gitlab::Marginalia.set_application_name Gitlab::Marginalia.enable_sidekiq_instrumentation - -Gitlab::Marginalia.set_enabled_from_feature_flag diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index c478123f4eb..ba44b900dbb 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -544,9 +544,9 @@ Settings.cron_jobs['postgres_dynamic_partitions_creator']['job_class'] ||= 'Part Settings.cron_jobs['ci_platform_metrics_update_cron_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['ci_platform_metrics_update_cron_worker']['cron'] ||= '47 9 * * *' Settings.cron_jobs['ci_platform_metrics_update_cron_worker']['job_class'] = 'CiPlatformMetricsUpdateCronWorker' -Settings.cron_jobs['analytics_instance_statistics_count_job_trigger_worker'] ||= Settingslogic.new({}) -Settings.cron_jobs['analytics_instance_statistics_count_job_trigger_worker']['cron'] ||= '50 23 */1 * *' -Settings.cron_jobs['analytics_instance_statistics_count_job_trigger_worker']['job_class'] ||= 'Analytics::InstanceStatistics::CountJobTriggerWorker' +Settings.cron_jobs['analytics_usage_trends_count_job_trigger_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['analytics_usage_trends_count_job_trigger_worker']['cron'] ||= '50 23 */1 * *' +Settings.cron_jobs['analytics_usage_trends_count_job_trigger_worker']['job_class'] ||= 'Analytics::UsageTrends::CountJobTriggerWorker' Settings.cron_jobs['member_invitation_reminder_emails_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['member_invitation_reminder_emails_worker']['cron'] ||= '0 0 * * *' Settings.cron_jobs['member_invitation_reminder_emails_worker']['job_class'] = 'MemberInvitationReminderEmailsWorker' @@ -710,7 +710,10 @@ Settings.workhorse['secret_file'] ||= Rails.root.join('.gitlab_workhorse_secret' # GitLab KAS # Settings['gitlab_kas'] ||= Settingslogic.new({}) +Settings.gitlab_kas['enabled'] ||= false Settings.gitlab_kas['secret_file'] ||= Rails.root.join('.gitlab_kas_secret') +Settings.gitlab_kas['external_url'] ||= 'wss://kas.example.com' +Settings.gitlab_kas['internal_url'] ||= 'grpc://localhost:8153' # # Repositories |