Give up on allowing shared access to APT repository

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

diff --git a/cookbooks/memcached/recipes/default.rb b/cookbooks/memcached/recipes/default.rb
index e387bc44b5b4ea413706a31fe269f217096bab91..a4a1462d3f9c99f95374a685c6b0e79ae61874c9 100644 (file)
--- a/cookbooks/memcached/recipes/default.rb
+++ b/cookbooks/memcached/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: memcached
+# Cookbook:: memcached

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "prometheus"
+

 package "memcached"
 
 service "memcached" do
 package "memcached"
 
 service "memcached" do


@@ -28,16 +30,11 @@ template "/etc/memcached.conf" do
   source "memcached.conf.erb"
   owner "root"
   group "root"
   source "memcached.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   notifies :restart, "service[memcached]"
 end
 
   notifies :restart, "service[memcached]"
 end
 

-munin_plugin_conf "memcached_multi" do
-  template "munin.erb"
-end
-
-%w[bytes commands conns evictions items memory].each do |stat|
-  munin_plugin "memcached_multi_#{stat}" do
-    target "memcached_multi_"
-  end
+prometheus_exporter "memcached" do
+  port 9150
+  options "--memcached.address=#{node[:memcached][:ip_address]}:#{node[:memcached][:tcp_port]} --memcached.pid-file=/run/memcached/memcached.pid"

 end
 end