Merge branch 'exclude_sidekiq_log' into 'master'

Exclude sidekiq.log

See merge request !236

CHANGELOG.md

@@ -7,6 +7,7 @@ omnibus-gitlab repository.
 - Use system UIDs and GIDs when creating accounts (Tim Bishop) cfc04342129a4c4dca5c4827d541c8888adadad3
 - Bundle GitLab CI with the package 3715204d86900e8501483f70c6370ba4e3f2bb3d
 - Fix inserting external_url in gitlab.rb after installation 59f5976562ce3439fb3a6e43caac489a5c230db4
+- Avoid duplicate sidekiq log entries on remote syslog servers
 
 7.4.0
 - Fix broken environment variable removal

files/gitlab-cookbooks/gitlab/templates/default/remote_syslog.yml.erb

@@ -1,7 +1,12 @@
 files:
 <% @services.each do |service| %>
-- <%= File.join(node['gitlab'][service]['log_directory'], "*.log") %>
+  - <%= File.join(node['gitlab'][service]['log_directory'], "*.log") %>
 <% end %>
+exclude_files:
+  # /var/log/gitlab-rails/sidekiq.log is a symlink to /var/log/sidekiq/current,
+  # which should already be being shipped off-site by svlogd. Exclude it from
+  # remote_syslog to avoid duplicate log entries on the syslog server.
+  - <%= File.join(node['gitlab']['gitlab-rails']['log_directory'], "sidekiq.log") %>
 destination:
   host: <%= @destination_host %>
   port: <%= @destination_port %>