palulukon: Allow access to AWS IP metadata NTP service

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

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 086047258a6d3f4e685b36b9531333f6e666fcc9..eae492f16c99cf4f49a5ca1a9a966c6631dbd841 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -18,7 +18,6 @@
 #
 
 include_recipe "apt::postgresql"
 #
 
 include_recipe "apt::postgresql"

-include_recipe "munin"

 include_recipe "prometheus"
 
 package "locales-all"
 include_recipe "prometheus"
 
 package "locales-all"


@@ -173,44 +172,4 @@ clusters.each do |name, details|
       action :delete
     end
   end
       action :delete
     end
   end

-
-  munin_suffix = name.tr("/", ":")
-
-  munin_plugin "postgres_bgwriter_#{munin_suffix}" do
-    target "postgres_bgwriter"
-    conf "munin.erb"
-    conf_variables :port => details[:port]
-  end
-
-  munin_plugin "postgres_checkpoints_#{munin_suffix}" do
-    target "postgres_checkpoints"
-    conf "munin.erb"
-    conf_variables :port => details[:port]
-  end
-
-  munin_plugin "postgres_connections_db_#{munin_suffix}" do
-    target "postgres_connections_db"
-    conf "munin.erb"
-    conf_variables :port => details[:port]
-  end
-
-  munin_plugin "postgres_users_#{munin_suffix}" do
-    target "postgres_users"
-    conf "munin.erb"
-    conf_variables :port => details[:port]
-  end
-
-  munin_plugin "postgres_xlog_#{munin_suffix}" do
-    target "postgres_xlog"
-    conf "munin.erb"
-    conf_variables :port => details[:port]
-  end
-
-  next unless File.exist?("/var/lib/postgresql/#{details[:version]}/main/recovery.conf")
-
-  munin_plugin "postgres_replication_#{munin_suffix}" do
-    target "postgres_replication"
-    conf "munin.erb"
-    conf_variables :port => details[:port]
-  end

 end
 end