From: Tom Hughes Date: Tue, 14 Jul 2015 08:57:01 +0000 (+0100) Subject: Fix detection of munin clients X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/52cbd01e53b20fcb0ef5226621c825807aaa9aaa?hp=0d8aa995f0a0866e8496dc1161fb1b72f2f6800a Fix detection of munin clients --- diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb index 675454de4..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|