Merge remote-tracking branch 'github/pull/564'

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

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 47ec3e80bfffee64cc580f0b8e09747adc339fa6..a57e1b3481f3918d011342bcc559940ce5cba9d6 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apt"
+include_recipe "apt::postgresql"

 include_recipe "munin"
 include_recipe "prometheus"
 
 include_recipe "munin"
 include_recipe "prometheus"
 


@@ -40,6 +40,7 @@ node[:postgresql][:versions].each do |version|
     mode "644"
     variables :version => version, :defaults => defaults, :settings => settings
     notifies :reload, "service[postgresql]"
     mode "644"
     variables :version => version, :defaults => defaults, :settings => settings
     notifies :reload, "service[postgresql]"

+    only_if { ::Dir.exist?("/etc/postgresql/#{version}/main") }

   end
 
   template "/etc/postgresql/#{version}/main/pg_hba.conf" do
   end
 
   template "/etc/postgresql/#{version}/main/pg_hba.conf" do


@@ -50,6 +51,7 @@ node[:postgresql][:versions].each do |version|
     variables :early_rules => settings[:early_authentication_rules] || defaults[:early_authentication_rules],
               :late_rules => settings[:late_authentication_rules] || defaults[:late_authentication_rules]
     notifies :reload, "service[postgresql]"
     variables :early_rules => settings[:early_authentication_rules] || defaults[:early_authentication_rules],
               :late_rules => settings[:late_authentication_rules] || defaults[:late_authentication_rules]
     notifies :reload, "service[postgresql]"

+    only_if { ::Dir.exist?("/etc/postgresql/#{version}/main") }

   end
 
   template "/etc/postgresql/#{version}/main/pg_ident.conf" do
   end
 
   template "/etc/postgresql/#{version}/main/pg_ident.conf" do


@@ -59,14 +61,17 @@ node[:postgresql][:versions].each do |version|
     mode "640"
     variables :maps => settings[:user_name_maps] || defaults[:user_name_maps]
     notifies :reload, "service[postgresql]"
     mode "640"
     variables :maps => settings[:user_name_maps] || defaults[:user_name_maps]
     notifies :reload, "service[postgresql]"

+    only_if { ::Dir.exist?("/etc/postgresql/#{version}/main") }

   end
 
   link "/var/lib/postgresql/#{version}/main/server.crt" do
     to "/etc/ssl/certs/ssl-cert-snakeoil.pem"
   end
 
   link "/var/lib/postgresql/#{version}/main/server.crt" do
     to "/etc/ssl/certs/ssl-cert-snakeoil.pem"

+    only_if { ::Dir.exist?("/var/lib/postgresql/#{version}/main") }

   end
 
   link "/var/lib/postgresql/#{version}/main/server.key" do
     to "/etc/ssl/private/ssl-cert-snakeoil.key"
   end
 
   link "/var/lib/postgresql/#{version}/main/server.key" do
     to "/etc/ssl/private/ssl-cert-snakeoil.key"

+    only_if { ::Dir.exist?("/var/lib/postgresql/#{version}/main") }

   end
 
   standby_mode = settings[:standby_mode] || defaults[:standby_mode]
   end
 
   standby_mode = settings[:standby_mode] || defaults[:standby_mode]


@@ -89,11 +94,13 @@ node[:postgresql][:versions].each do |version|
                 :restore_command => restore_command,
                 :passwords => passwords
       notifies :reload, "service[postgresql]"
                 :restore_command => restore_command,
                 :passwords => passwords
       notifies :reload, "service[postgresql]"

+      only_if { ::Dir.exist?("/var/lib/postgresql/#{version}/main") }

     end
   else
     template "/var/lib/postgresql/#{version}/main/recovery.conf" do
       action :delete
       notifies :reload, "service[postgresql]"
     end
   else
     template "/var/lib/postgresql/#{version}/main/recovery.conf" do
       action :delete
       notifies :reload, "service[postgresql]"

+      only_if { ::Dir.exist?("/var/lib/postgresql/#{version}/main") }

     end
   end
 end
     end
   end
 end


@@ -167,10 +174,13 @@ end
 
 prometheus_exporter "postgres" do
   port 9187
 
 prometheus_exporter "postgres" do
   port 9187

+  scrape_interval "1m"
+  scrape_timeout "1m"

   user "postgres"
   options "--extend.query-path=/etc/prometheus/exporters/postgres_queries.yml"
   environment "DATA_SOURCE_URI" => uris.sort.uniq.first,
               "PG_EXPORTER_AUTO_DISCOVER_DATABASES" => "true",
               "PG_EXPORTER_EXCLUDE_DATABASES" => "postgres,template0,template1"
   user "postgres"
   options "--extend.query-path=/etc/prometheus/exporters/postgres_queries.yml"
   environment "DATA_SOURCE_URI" => uris.sort.uniq.first,
               "PG_EXPORTER_AUTO_DISCOVER_DATABASES" => "true",
               "PG_EXPORTER_EXCLUDE_DATABASES" => "postgres,template0,template1"

+  restrict_address_families "AF_UNIX"

   subscribes :restart, "template[/etc/prometheus/exporters/postgres_queries.yml]"
 end
   subscribes :restart, "template[/etc/prometheus/exporters/postgres_queries.yml]"
 end