GitLab upgraded to 14.4.0-ee.0 - changelog: https://gitlab.com/gitlab-org/gitlab/blob/master/CHANGELOG-EE.md

Commit 0873c40b authored by Jennifer Davis's avatar Jennifer Davis Committed by GitHub
Browse files

Merge pull request #129 from aivaraslaimikis/multiple-servers-fix

New queue for new remote server
parents 853fb515 886017d5
# Generated by Chef
<% @servers.each.with_index(1) do |server, index| -%>
$ActionQueueType LinkedList # use asynchronous processing
$ActionQueueFileName srvrfwd # set file name, also enables disk mode
$ActionQueueFileName srvrfwd<%= index %> # set file name, also enables disk mode
$ActionResumeRetryCount -1 # infinite retries on insert failure
$ActionQueueSaveOnShutdown on # save in-memory data if rsyslog shuts down
$ActionQueueMaxDiskSpace <%= node['rsyslog']['action_queue_max_disk_space'] %> # Don't use more than this much space for the queue
......@@ -21,7 +22,6 @@ $ActionSendStreamDriverPermittedPeer <%= node['rsyslog']['tls_permitted_peer'] %
<% end -%>
<% end -%>
<% @servers.each do |server| -%>
<% case server['protocol'] -%>
<% when "tcp" -%>
<%= server['logs'] ? server['logs'] : node['rsyslog']['logs_to_forward'] %> @@<%= server['server'] %>:<%= server['port'] ? server['port'] : node['rsyslog']['port'] %><%= server['remote_template'] ? ';' + server['remote_template'] : nil %>
......@@ -30,4 +30,5 @@ $ActionSendStreamDriverPermittedPeer <%= node['rsyslog']['tls_permitted_peer'] %
<% else -%>
<%= server['logs'] ? server['logs'] : node['rsyslog']['logs_to_forward'] %><%= node['rsyslog']['protocol'] == "tcp" ? " @@" : " @" %><%= server['server'] %>:<%= server['port'] ? server['port'] : node['rsyslog']['port'] %><%= server['remote_template'] ? ';' + server['remote_template'] : nil %>
<% end -%>
<% end -%>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment