Skip to content
Snippets Groups Projects
Commit 1c7f0761b539 authored by Ian Baum's avatar Ian Baum
Browse files

Merge branch 'pedropombeiro/470076/implement-ch-worker' into 'master'

Add cronjob to sync finished pipelines to ClickHouse

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7783



Merged-by: default avatarIan Baum <ibaum@gitlab.com>
Approved-by: default avatarClemens Beck <cbeck@gitlab.com>
Approved-by: default avatarIan Baum <ibaum@gitlab.com>
Reviewed-by: default avatarIan Baum <ibaum@gitlab.com>
Co-authored-by: default avatarPedro Pombeiro <noreply@pedro.pombei.ro>
No related branches found
No related tags found
1 merge request!147Upstream merge up to the 17.2 branching point
...@@ -194,6 +194,8 @@ ...@@ -194,6 +194,8 @@
# gitlab_rails['ci_runner_versions_reconciliation_worker_cron'] = "@daily" # gitlab_rails['ci_runner_versions_reconciliation_worker_cron'] = "@daily"
# gitlab_rails['ci_runners_stale_machines_cleanup_worker_cron'] = "36 * * * *" # gitlab_rails['ci_runners_stale_machines_cleanup_worker_cron'] = "36 * * * *"
# gitlab_rails['ci_catalog_resources_process_sync_events_worker_cron'] = "*/1 * * * *" # gitlab_rails['ci_catalog_resources_process_sync_events_worker_cron'] = "*/1 * * * *"
# gitlab_rails['ci_click_house_finished_pipelines_sync_worker_cron'] = "*/4 * * * *"
# gitlab_rails['ci_click_house_finished_pipelines_sync_worker_args'] = [1]
### Webhook Settings ### Webhook Settings
###! Number of seconds to wait for HTTP response after sending webhook HTTP POST ###! Number of seconds to wait for HTTP response after sending webhook HTTP POST
......
...@@ -152,6 +152,8 @@ ...@@ -152,6 +152,8 @@
default['gitlab']['gitlab_rails']['incoming_email_auth_token'] = nil default['gitlab']['gitlab_rails']['incoming_email_auth_token'] = nil
default['gitlab']['gitlab_rails']['click_house_ci_finished_builds_sync_worker_cron'] = nil default['gitlab']['gitlab_rails']['click_house_ci_finished_builds_sync_worker_cron'] = nil
default['gitlab']['gitlab_rails']['click_house_ci_finished_builds_sync_worker_args'] = nil default['gitlab']['gitlab_rails']['click_house_ci_finished_builds_sync_worker_args'] = nil
default['gitlab']['gitlab_rails']['ci_click_house_finished_pipelines_sync_worker_cron'] = nil
default['gitlab']['gitlab_rails']['ci_click_house_finished_pipelines_sync_worker_args'] = nil
default['gitlab']['gitlab_rails']['service_desk_email_enabled'] = false default['gitlab']['gitlab_rails']['service_desk_email_enabled'] = false
default['gitlab']['gitlab_rails']['service_desk_email_address'] = nil default['gitlab']['gitlab_rails']['service_desk_email_address'] = nil
......
...@@ -609,6 +609,15 @@ ...@@ -609,6 +609,15 @@
cron: "<%= @ci_catalog_resources_process_sync_events_worker_cron %>" cron: "<%= @ci_catalog_resources_process_sync_events_worker_cron %>"
<% end %> <% end %>
# Periodically sync finished pipelines from p_ci_finished_pipeline_ch_sync_events to ClickHouse
<% unless @ci_click_house_finished_pipelines_sync_worker_cron.nil? %>
ci_click_house_finished_pipelines_sync_worker:
cron: "<%= @ci_click_house_finished_pipelines_sync_worker_cron %>"
<% unless @ci_click_house_finished_pipelines_sync_worker_args.nil? %>
args: <%= @ci_click_house_finished_pipelines_sync_worker_args %>
<% end %>
<% end %>
## ##
# GitLab EE only jobs: # GitLab EE only jobs:
......
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
'ci_runners_stale_machines_cleanup_worker' | 'ci_runners_stale_machines_cleanup_worker_cron' 'ci_runners_stale_machines_cleanup_worker' | 'ci_runners_stale_machines_cleanup_worker_cron'
'click_house_ci_finished_builds_sync_worker' | 'click_house_ci_finished_builds_sync_worker_cron' 'click_house_ci_finished_builds_sync_worker' | 'click_house_ci_finished_builds_sync_worker_cron'
'ci_catalog_resources_process_sync_events_worker' | 'ci_catalog_resources_process_sync_events_worker_cron' 'ci_catalog_resources_process_sync_events_worker' | 'ci_catalog_resources_process_sync_events_worker_cron'
'ci_click_house_finished_pipelines_sync_worker' | 'ci_click_house_finished_pipelines_sync_worker_cron'
end end
with_them do with_them do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment