From abd5ecd0198dd98d37c8cc13e457ce996b5b3d88 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 23 Oct 2015 09:06:04 +0100 Subject: [PATCH] Disable bogus foodcritic warning https://github.com/acrmp/foodcritic/issues/392 --- cookbooks/logstash/recipes/default.rb | 2 +- cookbooks/munin/recipes/default.rb | 2 +- cookbooks/munin/recipes/server.rb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cookbooks/logstash/recipes/default.rb b/cookbooks/logstash/recipes/default.rb index 55675fa71..b5d039705 100644 --- a/cookbooks/logstash/recipes/default.rb +++ b/cookbooks/logstash/recipes/default.rb @@ -60,7 +60,7 @@ template "/etc/cron.daily/expire-logstash" do mode 0755 end -forwarders = search(:node, "recipes:logstash\\:\\:forwarder") +forwarders = search(:node, "recipes:logstash\\:\\:forwarder") # ~FC010 forwarders.each do |forwarder| forwarder.interfaces(:role => :external) do |interface| diff --git a/cookbooks/munin/recipes/default.rb b/cookbooks/munin/recipes/default.rb index 3bffa27a6..fb1225c2f 100644 --- a/cookbooks/munin/recipes/default.rb +++ b/cookbooks/munin/recipes/default.rb @@ -29,7 +29,7 @@ service "munin-node" do supports :status => true, :restart => true, :reload => true end -servers = search(:node, "recipes:munin\\:\\:server") +servers = search(:node, "recipes:munin\\:\\:server") # ~FC010 servers.each do |server| server.interfaces(:role => :external) do |interface| diff --git a/cookbooks/munin/recipes/server.rb b/cookbooks/munin/recipes/server.rb index 3b71eaf10..bb5ba243a 100644 --- a/cookbooks/munin/recipes/server.rb +++ b/cookbooks/munin/recipes/server.rb @@ -45,9 +45,9 @@ munin_plugin "rrdcached" expiry_time = 14 * 86400 -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 +clients = search(:node, "recipes:munin\\:\\:default").sort_by { |n| n[:hostname] } # ~FC010 +frontends = search(:node, "recipes:web\\:\\:frontend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort # ~FC010 +backends = search(:node, "recipes:web\\:\\:backend").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.map { |n| n[:hostname] }.sort # ~FC010 tilecaches = search(:node, "roles:tilecache").reject { |n| Time.now - Time.at(n[:ohai_time]) > expiry_time }.sort_by { |n| n[:hostname] }.map do |n| { :name => n[:hostname], :interface => n.interfaces(:role => :external).first[:interface] } end -- 2.43.2