diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 12:09:13 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-18 12:09:13 +0000 |
| commit | 1363ca12f1f07c634647cf55c4c16b7401098673 (patch) | |
| tree | d932caf09c8148322edb51ae954ed159ff7d00f8 /config | |
| parent | 6763d2787670bc03a36a8eb601703e88fc70dece (diff) | |
| download | gitlab-ce-1363ca12f1f07c634647cf55c4c16b7401098673.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/gitlab.yml.example | 5 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 3 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 81085d4641e..eb41e4ac423 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -459,6 +459,11 @@ production: &base elastic_index_bulk_cron_worker: cron: "*/1 * * * *" + # Elasticsearch metrics + # NOTE: This will only take effect if Elasticsearch is enabled. + elastic_metrics_update_worker: + cron: "*/1 * * * *" + registry: # enabled: true # host: registry.example.com diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 8d88d1bcf7c..81de0ac6818 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -546,6 +546,9 @@ Gitlab.ee do Settings.cron_jobs['elastic_index_bulk_cron_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['elastic_index_bulk_cron_worker']['cron'] ||= '*/1 * * * *' Settings.cron_jobs['elastic_index_bulk_cron_worker']['job_class'] ||= 'ElasticIndexBulkCronWorker' + Settings.cron_jobs['elastic_metrics_update_worker'] ||= Settingslogic.new({}) + Settings.cron_jobs['elastic_metrics_update_worker']['cron'] ||= '*/1 * * * *' + Settings.cron_jobs['elastic_metrics_update_worker']['job_class'] ||= 'ElasticMetricsUpdateWorker' Settings.cron_jobs['sync_seat_link_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['sync_seat_link_worker']['cron'] ||= "#{rand(60)} 0 * * *" Settings.cron_jobs['sync_seat_link_worker']['job_class'] = 'SyncSeatLinkWorker' diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 2dc2f33e71e..858766f19ca 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -128,6 +128,8 @@ - 1 - - jira_connect - 1 +- - jira_importer + - 1 - - ldap_group_sync - 2 - - mail_scheduler |