X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/39e9c0f23c2c459285df473de8011221f429dbad..eb15b15aae4c6f83fcc917214d33458052ae248a:/cookbooks/overpass/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/overpass/recipes/default.rb b/cookbooks/overpass/recipes/default.rb index 720b11321..0cad2a1ab 100644 --- a/cookbooks/overpass/recipes/default.rb +++ b/cookbooks/overpass/recipes/default.rb @@ -19,7 +19,6 @@ include_recipe "accounts" include_recipe "apache" -include_recipe "munin" include_recipe "prometheus" include_recipe "ruby" @@ -27,7 +26,7 @@ username = "overpass" basedir = data_bag_item("accounts", username)["home"] web_passwords = data_bag_item("web", "passwords") -%w[bin site diffs db src munin].each do |dirname| +%w[bin site diffs db src].each do |dirname| directory "#{basedir}/#{dirname}" do owner username group username @@ -229,24 +228,6 @@ template "/etc/logrotate.d/overpass" do variables :logdir => logdir end -# Munin scripts - -%w[db_lag request_count].each do |name| - template "#{basedir}/munin/overpass_#{name}" do - source "munin_#{name}.erb" - owner username - group username - mode "755" - variables :basedir => basedir - end - - munin_plugin "overpass_#{name}" do - target "#{basedir}/munin/overpass_#{name}" - conf "munin.erb" - conf_variables :user => username - end -end - prometheus_exporter "overpass" do port 9898 user username