Reorder authorization matches

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

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 9fe64344a36049b7f1a5c281b1e22e3dae205009..a3ef7d23d9f4bb2ce687531510cc7c7cc184bc62 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: postgresql
+# Cookbook:: postgresql

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

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

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

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,12 +17,12 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-package "postgresql-common"
+include_recipe "apt::postgresql"
+include_recipe "munin"
+include_recipe "prometheus"

 
 

-service "postgresql" do
-  action [:enable, :start]
-  supports :status => true, :restart => true, :reload => true
-end
+package "locales-all"
+package "postgresql-common"

 
 node[:postgresql][:versions].each do |version|
   package "postgresql-#{version}"
 
 node[:postgresql][:versions].each do |version|
   package "postgresql-#{version}"


@@ -33,67 +33,82 @@ node[:postgresql][:versions].each do |version|
   defaults = node[:postgresql][:settings][:defaults] || {}
   settings = node[:postgresql][:settings][version] || {}
 
   defaults = node[:postgresql][:settings][:defaults] || {}
   settings = node[:postgresql][:settings][version] || {}
 

+  standby_mode = settings[:standby_mode] || defaults[:standby_mode]
+  primary_conninfo = settings[:primary_conninfo] || defaults[:primary_conninfo]
+
+  passwords = if primary_conninfo
+                data_bag_item(primary_conninfo[:passwords][:bag],
+                              primary_conninfo[:passwords][:item])
+              end
+

   template "/etc/postgresql/#{version}/main/postgresql.conf" do
     source "postgresql.conf.erb"
     owner "postgres"
     group "postgres"
   template "/etc/postgresql/#{version}/main/postgresql.conf" do
     source "postgresql.conf.erb"
     owner "postgres"
     group "postgres"

-    mode 0644
-    variables :version => version, :defaults => defaults, :settings => settings
+    mode "644"
+    variables :version => version,
+              :defaults => defaults,
+              :settings => settings,
+              :primary_conninfo => primary_conninfo,
+              :passwords => passwords

     notifies :reload, "service[postgresql]"
     notifies :reload, "service[postgresql]"

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

   end
 
   template "/etc/postgresql/#{version}/main/pg_hba.conf" do
     source "pg_hba.conf.erb"
     owner "postgres"
     group "postgres"
   end
 
   template "/etc/postgresql/#{version}/main/pg_hba.conf" do
     source "pg_hba.conf.erb"
     owner "postgres"
     group "postgres"

-    mode 0640
+    mode "640"

     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
     source "pg_ident.conf.erb"
     owner "postgres"
     group "postgres"
   end
 
   template "/etc/postgresql/#{version}/main/pg_ident.conf" do
     source "pg_ident.conf.erb"
     owner "postgres"
     group "postgres"

-    mode 0640
+    mode "640"

     variables :maps => settings[:user_name_maps] || defaults[:user_name_maps]
     notifies :reload, "service[postgresql]"
     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
 
   end
 

-  restore_command = settings[:restore_command] || defaults[:restore_command]
-  standby_mode = settings[:standby_mode] || defaults[:standby_mode]
-
-  if restore_command || standby_mode == "on"
-    template "/var/lib/postgresql/#{version}/main/recovery.conf" do
-      source "recovery.conf.erb"
+  if standby_mode == "on"
+    file "/var/lib/postgresql/#{version}/main/standby.signal" do

       owner "postgres"
       group "postgres"
       owner "postgres"
       group "postgres"

-      mode 0640
-      variables :defaults => defaults, :settings => settings
-      notifies :reload, "service[postgresql]"
+      mode "640"

     end
   else
     end
   else

-    template "/var/lib/postgresql/#{version}/main/recovery.conf" do
+    file "/var/lib/postgresql/#{version}/main/standby.signal" do

       action :delete
       action :delete

-      notifies :reload, "service[postgresql]"

     end
   end
 end
 
     end
   end
 end
 

+service "postgresql" do
+  action [:enable, :start]
+  supports :status => true, :restart => true, :reload => true
+end
+

 ohai_plugin "postgresql" do
   template "ohai.rb.erb"
 end
 
 ohai_plugin "postgresql" do
   template "ohai.rb.erb"
 end
 

-package "ptop"
+package "pgtop"

 package "libdbd-pg-perl"
 
 clusters = node[:postgresql][:clusters] || []
 package "libdbd-pg-perl"
 
 clusters = node[:postgresql][:clusters] || []


@@ -131,11 +146,36 @@ clusters.each do |name, details|
     conf_variables :port => details[:port]
   end
 
     conf_variables :port => details[:port]
   end
 

-  if File.exist?("/var/lib/postgresql/#{details[:version]}/main/recovery.conf")
-    munin_plugin "postgres_replication_#{suffix}" do
-      target "postgres_replication"
-      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_#{suffix}" do
+    target "postgres_replication"
+    conf "munin.erb"
+    conf_variables :port => details[:port]

   end
 end
   end
 end

+
+uris = clusters.collect do |_, details|
+  "postgres@:#{details[:port]}/postgres?host=/run/postgresql"
+end
+
+template "/etc/prometheus/exporters/postgres_queries.yml" do
+  source "postgres_queries.yml.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
+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"
+  restrict_address_families "AF_UNIX"
+  remove_ipc false
+  subscribes :restart, "template[/etc/prometheus/exporters/postgres_queries.yml]"
+end