Revert "Switch bytemark to use eddie for readonly database queries"

[chef.git] / cookbooks / memcached / recipes / default.rb

diff --git a/cookbooks/memcached/recipes/default.rb b/cookbooks/memcached/recipes/default.rb
index 8ef4cec1f3d8cb7e2e12b1446a25462f46d3455e..7186626c01af5d65ba995f3315152d4414676c04 100644 (file)
--- a/cookbooks/memcached/recipes/default.rb
+++ b/cookbooks/memcached/recipes/default.rb
@@ -28,7 +28,7 @@ template "/etc/memcached.conf" do
   source "memcached.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[memcached]"
 end
 
@@ -36,26 +36,8 @@ munin_plugin_conf "memcached_multi" do
   template "munin.erb"
 end
 
-munin_plugin "memcached_multi_bytes" do
-  target "memcached_multi_"
-end
-
-munin_plugin "memcached_multi_commands" do
-  target "memcached_multi_"
-end
-
-munin_plugin "memcached_multi_conns" do
-  target "memcached_multi_"
-end
-
-munin_plugin "memcached_multi_evictions" do
-  target "memcached_multi_"
-end
-
-munin_plugin "memcached_multi_items" do
-  target "memcached_multi_"
-end
-
-munin_plugin "memcached_multi_memory" do
-  target "memcached_multi_"
+%w[bytes commands conns evictions items memory].each do |stat|
+  munin_plugin "memcached_multi_#{stat}" do
+    target "memcached_multi_"
+  end
 end