Add a recipe for the remote-syslog service

Jacob Vosmaer
1 parent a621a76a
Showing 9 changed files with 100 additions and 0 deletions Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
files/gitlab-cookbooks/gitlab/libraries/gitlab.rb
files/gitlab-cookbooks/gitlab/recipes/default.rb
files/gitlab-cookbooks/gitlab/recipes/remote-syslog.rb
files/gitlab-cookbooks/gitlab/recipes/remote-syslog_disable.rb
files/gitlab-cookbooks/gitlab/templates/default/remote_syslog.yml.erb
files/gitlab-cookbooks/gitlab/templates/default/sv-remote-syslog-log-config.erb
files/gitlab-cookbooks/gitlab/templates/default/sv-remote-syslog-log-run.erb
files/gitlab-cookbooks/gitlab/templates/default/sv-remote-syslog-run.erb
@@ -258,3 +258,14 @@ default[&#39;gitlab&#39;][&#39;logging&#39;][&#39;svlogd_timeout&#39;] = 24 * 60 * 60 # rotate after 24 
 default['gitlab']['logging']['svlogd_filter'] = "gzip" # compress logs with gzip
 default['gitlab']['logging']['svlogd_udp'] = nil # transmit log messages via UDP
 default['gitlab']['logging']['svlogd_prefix'] = nil # custom prefix for log messages
+
+###
+# Remote syslog
+###
+default['gitlab']['remote-syslog']['enable'] = false
+default['gitlab']['remote-syslog']['ha'] = false
+default['gitlab']['remote-syslog']['dir'] = "/var/opt/gitlab/remote-syslog"
+default['gitlab']['remote-syslog']['log_directory'] = "/var/log/gitlab/remote-syslog"
+default['gitlab']['remote-syslog']['destination_host'] = "localhost"
+default['gitlab']['remote-syslog']['destination_port'] = 514
+default['gitlab']['remote-syslog']['services'] = %w{redis nginx unicorn gitlab-rails postgresql sidekiq}
@@ -44,6 +44,7 @@ module Gitlab
   sidekiq Mash.new
   nginx Mash.new
   logging Mash.new
+  remote_syslog Mash.new
   node nil
   external_url nil
   git_data_dir nil
@@ -132,6 +133,7 @@ module Gitlab
         "sidekiq",
         "nginx",
         "logging",
+        "remote_syslog",
         "postgresql"
       ].each do |key|
         rkey = key.gsub('_', '-')
@@ -70,6 +70,7 @@ include_recipe &quot;runit&quot;
   "unicorn",
   "sidekiq",
   "nginx",
+  "remote-syslog",
   "bootstrap",
 ].each do |service|
   if node["gitlab"][service]["enable"]
@@ -0,0 +1,48 @@
+#
+# Copyright:: Copyright (c) 2014 GitLab B.V.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+remote_syslog_dir = node['gitlab']['remote-syslog']['dir']
+remote_syslog_log_dir = node['gitlab']['remote-syslog']['log_directory']
+
+[
+  remote_syslog_dir,
+  remote_syslog_log_dir
+].each do |dir|
+  directory dir do
+    mode "0700"
+  end
+end
+
+template File.join(remote_syslog_dir, "remote_syslog.yml") do
+  mode "0644"
+  variables(node['gitlab']['remote-syslog'].to_hash)
+  notifies :restart, 'service[remote-syslog]' if OmnibusHelper.should_notify?("remote-syslog")
+end
+
+runit_service "remote-syslog" do
+  down node['gitlab']['remote-syslog']['ha']
+  options({
+    :log_directory => remote_syslog_log_dir
+  }.merge(params))
+  log_options node['gitlab']['logging'].to_hash.merge(node['gitlab']['remote-syslog'].to_hash)
+end
+
+if node['gitlab']['bootstrap']['enable']
+  execute "/opt/gitlab/bin/gitlab-ctl start remote-syslog" do
+    retries 20
+  end
+end
@@ -0,0 +1,20 @@
+#
+# Copyright:: Copyright (c) 2014 GitLab.com
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+runit_service "remote-syslog" do
+  action :disable
+end
@@ -0,0 +1,7 @@
+files:
+<% @services.each do |service| %>
+- <%= File.join(node['gitlab'][service]['log_directory'], "*.log") %>
+<% end %>
+destination:
+  host: <%= @destination_host %>
+  port: <%= @destination_port %>
@@ -0,0 +1,6 @@
+<%= "s#@svlogd_size" if @svlogd_size %>
+<%= "n#@svlogd_num" if @svlogd_num %>
+<%= "t#@svlogd_timeout" if @svlogd_timeout %>
+<%= "!#@svlogd_filter" if @svlogd_filter %>
+<%= "u#@svlogd_udp" if @svlogd_udp %>
+<%= "p#@svlogd_prefix" if @svlogd_prefix %>
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec svlogd -tt <%= @options[:log_directory] %>
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec /opt/gitlab/embedded/bin/remote_syslog --no-detach --debug-level DEBUG -c <%= node['gitlab']['remote-syslog']['dir'] %>/remote_syslog.yml
...	...	@@ -258,3 +258,14 @@ default['gitlab']['logging']['svlogd_timeout'] = 24 * 60 * 60 # rotate after 24
258	258	default['gitlab']['logging']['svlogd_filter'] = "gzip" # compress logs with gzip
259	259	default['gitlab']['logging']['svlogd_udp'] = nil # transmit log messages via UDP
260	260	default['gitlab']['logging']['svlogd_prefix'] = nil # custom prefix for log messages
	261	+
	262	+###
	263	+# Remote syslog
	264	+###
	265	+default['gitlab']['remote-syslog']['enable'] = false
	266	+default['gitlab']['remote-syslog']['ha'] = false
	267	+default['gitlab']['remote-syslog']['dir'] = "/var/opt/gitlab/remote-syslog"
	268	+default['gitlab']['remote-syslog']['log_directory'] = "/var/log/gitlab/remote-syslog"
	269	+default['gitlab']['remote-syslog']['destination_host'] = "localhost"
	270	+default['gitlab']['remote-syslog']['destination_port'] = 514
	271	+default['gitlab']['remote-syslog']['services'] = %w{redis nginx unicorn gitlab-rails postgresql sidekiq}
...	...
...	...	@@ -44,6 +44,7 @@ module Gitlab
44	44	sidekiq Mash.new
45	45	nginx Mash.new
46	46	logging Mash.new
	47	+ remote_syslog Mash.new
47	48	node nil
48	49	external_url nil
49	50	git_data_dir nil
...	...	@@ -132,6 +133,7 @@ module Gitlab
132	133	"sidekiq",
133	134	"nginx",
134	135	"logging",
	136	+ "remote_syslog",
135	137	"postgresql"
136	138	].each do \|key\|
137	139	rkey = key.gsub('_', '-')
...	...
...	...	@@ -70,6 +70,7 @@ include_recipe "runit"
70	70	"unicorn",
71	71	"sidekiq",
72	72	"nginx",
	73	+ "remote-syslog",
73	74	"bootstrap",
74	75	].each do \|service\|
75	76	if node["gitlab"][service]["enable"]
...	...
...	...	@@ -0,0 +1,48 @@
	1	+#
	2	+# Copyright:: Copyright (c) 2014 GitLab B.V.
	3	+# License:: Apache License, Version 2.0
	4	+#
	5	+# Licensed under the Apache License, Version 2.0 (the "License");
	6	+# you may not use this file except in compliance with the License.
	7	+# You may obtain a copy of the License at
	8	+#
	9	+# http://www.apache.org/licenses/LICENSE-2.0
	10	+#
	11	+# Unless required by applicable law or agreed to in writing, software
	12	+# distributed under the License is distributed on an "AS IS" BASIS,
	13	+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	14	+# See the License for the specific language governing permissions and
	15	+# limitations under the License.
	16	+#
	17	+
	18	+remote_syslog_dir = node['gitlab']['remote-syslog']['dir']
	19	+remote_syslog_log_dir = node['gitlab']['remote-syslog']['log_directory']
	20	+
	21	+[
	22	+ remote_syslog_dir,
	23	+ remote_syslog_log_dir
	24	+].each do \|dir\|
	25	+ directory dir do
	26	+ mode "0700"
	27	+ end
	28	+end
	29	+
	30	+template File.join(remote_syslog_dir, "remote_syslog.yml") do
	31	+ mode "0644"
	32	+ variables(node['gitlab']['remote-syslog'].to_hash)
	33	+ notifies :restart, 'service[remote-syslog]' if OmnibusHelper.should_notify?("remote-syslog")
	34	+end
	35	+
	36	+runit_service "remote-syslog" do
	37	+ down node['gitlab']['remote-syslog']['ha']
	38	+ options({
	39	+ :log_directory => remote_syslog_log_dir
	40	+ }.merge(params))
	41	+ log_options node['gitlab']['logging'].to_hash.merge(node['gitlab']['remote-syslog'].to_hash)
	42	+end
	43	+
	44	+if node['gitlab']['bootstrap']['enable']
	45	+ execute "/opt/gitlab/bin/gitlab-ctl start remote-syslog" do
	46	+ retries 20
	47	+ end
	48	+end
...	...
...	...	@@ -0,0 +1,20 @@
	1	+#
	2	+# Copyright:: Copyright (c) 2014 GitLab.com
	3	+# License:: Apache License, Version 2.0
	4	+#
	5	+# Licensed under the Apache License, Version 2.0 (the "License");
	6	+# you may not use this file except in compliance with the License.
	7	+# You may obtain a copy of the License at
	8	+#
	9	+# http://www.apache.org/licenses/LICENSE-2.0
	10	+#
	11	+# Unless required by applicable law or agreed to in writing, software
	12	+# distributed under the License is distributed on an "AS IS" BASIS,
	13	+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	14	+# See the License for the specific language governing permissions and
	15	+# limitations under the License.
	16	+#
	17	+
	18	+runit_service "remote-syslog" do
	19	+ action :disable
	20	+end
...	...
...	...	@@ -0,0 +1,7 @@
	1	+files:
	2	+<% @services.each do \|service\| %>
	3	+- <%= File.join(node['gitlab'][service]['log_directory'], "*.log") %>
	4	+<% end %>
	5	+destination:
	6	+ host: <%= @destination_host %>
	7	+ port: <%= @destination_port %>
...	...
...	...	@@ -0,0 +1,6 @@
	1	+<%= "s#@svlogd_size" if @svlogd_size %>
	2	+<%= "n#@svlogd_num" if @svlogd_num %>
	3	+<%= "t#@svlogd_timeout" if @svlogd_timeout %>
	4	+<%= "!#@svlogd_filter" if @svlogd_filter %>
	5	+<%= "u#@svlogd_udp" if @svlogd_udp %>
	6	+<%= "p#@svlogd_prefix" if @svlogd_prefix %>
...	...
...	...	@@ -0,0 +1,2 @@
	1	+#!/bin/sh
	2	+exec svlogd -tt <%= @options[:log_directory] %>
...	...
...	...	@@ -0,0 +1,3 @@
	1	+#!/bin/sh
	2	+exec 2>&1
	3	+exec /opt/gitlab/embedded/bin/remote_syslog --no-detach --debug-level DEBUG -c <%= node['gitlab']['remote-syslog']['dir'] %>/remote_syslog.yml
...	...