X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6cfcfbe0138f1b11e9a62bd8193e729126f617ee..f1dec95b684d66a563de20fae4bf4b6fce7e93d5:/cookbooks/web/recipes/rails.rb diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb index 6616c49f0..98b515d42 100644 --- a/cookbooks/web/recipes/rails.rb +++ b/cookbooks/web/recipes/rails.rb @@ -57,8 +57,6 @@ rails_port "www.openstreetmap.org" do messages_domain "messages.openstreetmap.org" quova_username "ws360602" quova_password web_passwords["quova"] - soft_memory_limit node[:web][:rails_soft_memory_limit] - hard_memory_limit node[:web][:rails_hard_memory_limit] gpx_dir "/store/rails/gpx" attachments_dir "/store/rails/attachments" log_path "#{node[:web][:log_directory]}/rails.log" @@ -68,3 +66,38 @@ rails_port "www.openstreetmap.org" do oauth_key web_passwords["oauth_key"] piwik_configuration piwik_configuration end + +gem_package "apachelogregex" +gem_package "file-tail" + +template "/usr/local/bin/api-statistics" do + source "api-statistics.erb" + owner "root" + group "root" + mode 0755 +end + +template "/etc/init.d/api-statistics" do + source "api-statistics.init.erb" + owner "root" + group "root" + mode 0755 +end + +service "api-statistics" do + action [:enable, :start] + supports :restart => true + subscribes :restart, "template[/usr/local/bin/api-statistics]" + subscribes :restart, "template[/etc/init.d/api-statistics]" +end + +munin_plugin "api_calls_status" +munin_plugin "api_calls_num" + +munin_plugin "api_calls_#{node[:hostname]}" do + target "api_calls_" +end + +munin_plugin "api_waits_#{node[:hostname]}" do + target "api_waits_" +end