Fix prometheus monitoring of multiple postgres instances

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

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index a0d9f0e90a3de04b165753cb8bf2e6958c92c70b..47ec3e80bfffee64cc580f0b8e09747adc339fa6 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,6 +17,11 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "apt"
+include_recipe "munin"
+include_recipe "prometheus"
+
+package "locales-all"

 package "postgresql-common"
 
 node[:postgresql][:versions].each do |version|
 package "postgresql-common"
 
 node[:postgresql][:versions].each do |version|


@@ -32,7 +37,7 @@ node[:postgresql][:versions].each do |version|
     source "postgresql.conf.erb"
     owner "postgres"
     group "postgres"
     source "postgresql.conf.erb"
     owner "postgres"
     group "postgres"

-    mode 0644
+    mode "644"

     variables :version => version, :defaults => defaults, :settings => settings
     notifies :reload, "service[postgresql]"
   end
     variables :version => version, :defaults => defaults, :settings => settings
     notifies :reload, "service[postgresql]"
   end


@@ -41,7 +46,7 @@ node[:postgresql][:versions].each do |version|
     source "pg_hba.conf.erb"
     owner "postgres"
     group "postgres"
     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]"


@@ -51,7 +56,7 @@ node[:postgresql][:versions].each do |version|
     source "pg_ident.conf.erb"
     owner "postgres"
     group "postgres"
     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]"
   end
     variables :maps => settings[:user_name_maps] || defaults[:user_name_maps]
     notifies :reload, "service[postgresql]"
   end


@@ -64,16 +69,25 @@ node[:postgresql][:versions].each do |version|
     to "/etc/ssl/private/ssl-cert-snakeoil.key"
   end
 
     to "/etc/ssl/private/ssl-cert-snakeoil.key"
   end
 

-  restore_command = settings[:restore_command] || defaults[:restore_command]

   standby_mode = settings[:standby_mode] || defaults[:standby_mode]
   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"
 
   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"
       owner "postgres"
       group "postgres"
     template "/var/lib/postgresql/#{version}/main/recovery.conf" do
       source "recovery.conf.erb"
       owner "postgres"
       group "postgres"

-      mode 0640
-      variables :defaults => defaults, :settings => settings
+      mode "640"
+      variables :standby_mode => standby_mode,
+                :primary_conninfo => primary_conninfo,
+                :restore_command => restore_command,
+                :passwords => passwords

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


@@ -93,7 +107,7 @@ ohai_plugin "postgresql" do
   template "ohai.rb.erb"
 end
 
   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] || []


@@ -139,3 +153,24 @@ clusters.each do |name, details|
     conf_variables :port => details[:port]
   end
 end
     conf_variables :port => details[:port]
   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
+  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"
+  subscribes :restart, "template[/etc/prometheus/exporters/postgres_queries.yml]"
+end