X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9e84412b7279e2b3438637e4dd121c0adea4cd53..2e5da4c766bef71968e4c018751183ed31bd4633:/cookbooks/munin/recipes/server.rb diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb index 6d628bb8c..c30078b82 100644 --- a/cookbooks/munin/recipes/server.rb +++ b/cookbooks/munin/recipes/server.rb @@ -45,7 +45,7 @@ munin_plugin "rrdcached" expiry_time = 14 * 86400 -clients = search(:node, "recipes:munin").select { |n| n[:munin] }.sort_by { |n| n[:hostname] } +clients = search(:node, "recipes:munin\\:\\:default").sort_by { |n| n[:hostname] } frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n| @@ -85,7 +85,7 @@ template "/etc/cron.daily/munin-backup" do source "backup.cron.erb" owner "root" group "root" - mode 0750 + mode 0755 end munin_plugin "munin_stats"