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

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

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 4e5068712259a4366f4cdacd886649f0e6539f3d..3bf0ad154e6ca39e09a1819a4ca5e06c5bad386c 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -17,8 +17,9 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

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

 include_recipe "munin"
 include_recipe "munin"

+include_recipe "prometheus"

 
 package "locales-all"
 package "postgresql-common"
 
 package "locales-all"
 package "postgresql-common"


@@ -32,13 +33,26 @@ 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"
     mode "644"
   template "/etc/postgresql/#{version}/main/postgresql.conf" do
     source "postgresql.conf.erb"
     owner "postgres"
     group "postgres"
     mode "644"

-    variables :version => version, :defaults => defaults, :settings => settings
+    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
   end
 
   template "/etc/postgresql/#{version}/main/pg_hba.conf" do


@@ -49,6 +63,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


@@ -58,41 +73,28 @@ 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
 
   end
 

-  standby_mode = settings[:standby_mode] || defaults[:standby_mode]
-  primary_conninfo = settings[:primary_conninfo] || defaults[:primary_conninfo]
-  restore_command = settings[:restore_command] || defaults[:restore_command]
-
-  if restore_command || standby_mode == "on"
-    passwords = if primary_conninfo
-                  data_bag_item(primary_conninfo[:passwords][:bag],
-                                primary_conninfo[:passwords][:item])
-                end
-
-    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"
       mode "640"
       owner "postgres"
       group "postgres"
       mode "640"

-      variables :standby_mode => standby_mode,
-                :primary_conninfo => primary_conninfo,
-                :restore_command => restore_command,
-                :passwords => passwords
-      notifies :reload, "service[postgresql]"

     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


@@ -106,39 +108,63 @@ ohai_plugin "postgresql" do
   template "ohai.rb.erb"
 end
 
   template "ohai.rb.erb"
 end
 

+template "/etc/prometheus/exporters/postgres_queries.yml" do
+  source "postgres_queries.yml.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+

 package "pgtop"
 package "libdbd-pg-perl"
 
 clusters = node[:postgresql][:clusters] || []
 
 clusters.each do |name, details|
 package "pgtop"
 package "libdbd-pg-perl"
 
 clusters = node[:postgresql][:clusters] || []
 
 clusters.each do |name, details|

-  suffix = name.tr("/", ":")
+  prometheus_suffix = name.tr("/", "-")
+  prometheus_database = node[:postgresql][:monitor_database]
+
+  prometheus_exporter "postgres" do
+    port 10000 + details[:port].to_i
+    service "postgres-#{prometheus_suffix}"
+    labels "cluster" => name
+    scrape_interval "1m"
+    scrape_timeout "1m"
+    user "postgres"
+    options "--no-collector.process_idle --extend.query-path=/etc/prometheus/exporters/postgres_queries.yml"
+    environment "DATA_SOURCE_NAME" => "postgres:///#{prometheus_database}?host=/run/postgresql&port=#{details[:port]}"
+    restrict_address_families "AF_UNIX"
+    remove_ipc false
+    subscribes :restart, "template[/etc/prometheus/exporters/postgres_queries.yml]"
+  end
+
+  munin_suffix = name.tr("/", ":")

 
 

-  munin_plugin "postgres_bgwriter_#{suffix}" do
+  munin_plugin "postgres_bgwriter_#{munin_suffix}" do

     target "postgres_bgwriter"
     conf "munin.erb"
     conf_variables :port => details[:port]
   end
 
     target "postgres_bgwriter"
     conf "munin.erb"
     conf_variables :port => details[:port]
   end
 

-  munin_plugin "postgres_checkpoints_#{suffix}" do
+  munin_plugin "postgres_checkpoints_#{munin_suffix}" do

     target "postgres_checkpoints"
     conf "munin.erb"
     conf_variables :port => details[:port]
   end
 
     target "postgres_checkpoints"
     conf "munin.erb"
     conf_variables :port => details[:port]
   end
 

-  munin_plugin "postgres_connections_db_#{suffix}" do
+  munin_plugin "postgres_connections_db_#{munin_suffix}" do

     target "postgres_connections_db"
     conf "munin.erb"
     conf_variables :port => details[:port]
   end
 
     target "postgres_connections_db"
     conf "munin.erb"
     conf_variables :port => details[:port]
   end
 

-  munin_plugin "postgres_users_#{suffix}" do
+  munin_plugin "postgres_users_#{munin_suffix}" do

     target "postgres_users"
     conf "munin.erb"
     conf_variables :port => details[:port]
   end
 
     target "postgres_users"
     conf "munin.erb"
     conf_variables :port => details[:port]
   end
 

-  munin_plugin "postgres_xlog_#{suffix}" do
+  munin_plugin "postgres_xlog_#{munin_suffix}" do

     target "postgres_xlog"
     conf "munin.erb"
     conf_variables :port => details[:port]
     target "postgres_xlog"
     conf "munin.erb"
     conf_variables :port => details[:port]


@@ -146,9 +172,17 @@ clusters.each do |name, details|
 
   next unless File.exist?("/var/lib/postgresql/#{details[:version]}/main/recovery.conf")
 
 
   next unless File.exist?("/var/lib/postgresql/#{details[:version]}/main/recovery.conf")
 

-  munin_plugin "postgres_replication_#{suffix}" do
+  munin_plugin "postgres_replication_#{munin_suffix}" do

     target "postgres_replication"
     conf "munin.erb"
     conf_variables :port => details[:port]
   end
 end
     target "postgres_replication"
     conf "munin.erb"
     conf_variables :port => details[:port]
   end
 end

+
+service "prometheus-postgres-exporter" do
+  action [:stop, :disable]
+end
+
+systemd_service "prometheus-postgres-exporter" do
+  action :delete
+end