nominatim: update Python packages

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

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index f5bab62318e1b8ecdc6c2c2876b8404dd67aedef..086047258a6d3f4e685b36b9531333f6e666fcc9 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -112,35 +112,95 @@ package "pgtop"
 package "libdbd-pg-perl"
 
 clusters = node[:postgresql][:clusters] || []
 package "libdbd-pg-perl"
 
 clusters = node[:postgresql][:clusters] || []

+passwords = data_bag_item("postgresql", "passwords")

 
 clusters.each do |name, details|
 
 clusters.each do |name, details|

-  suffix = name.tr("/", ":")
+  prometheus_suffix = name.tr("/", "-")
+  prometheus_database = node[:postgresql][:monitor_database]
+
+  postgresql_user "prometheus" do
+    cluster name
+    password passwords["prometheus"]
+    roles "pg_monitor"
+    not_if { ::File.exist?("/var/lib/postgresql/#{name}/standby.signal") }
+  end
+
+  prometheus_exporter "postgres" do
+    port 10000 + details[:port].to_i
+    service "postgres-#{prometheus_suffix}"
+    labels "cluster" => name
+    scrape_interval "1m"
+    scrape_timeout "1m"
+    options %w[
+      --collector.database_wraparound
+      --collector.long_running_transactions
+      --collector.process_idle
+      --collector.stat_activity_autovacuum
+      --collector.stat_wal_receiver
+      --collector.statio_user_indexes
+    ]
+    environment "DATA_SOURCE_NAME" => "postgres:///#{prometheus_database}?host=/run/postgresql&port=#{details[:port]}&user=prometheus&password=#{passwords['prometheus']}"
+    restrict_address_families "AF_UNIX"
+    subscribes :restart, "template[/etc/prometheus/exporters/postgres_queries.yml]"
+  end

 
 

-  munin_plugin "postgres_bgwriter_#{suffix}" do
+  if node[:postgresql][:monitor_queries]
+    template "/etc/prometheus/exporters/sql_exporter.yml" do
+      source "sql_exporter.yml.erb"
+      owner "root"
+      group "root"
+      mode "644"
+    end
+
+    prometheus_exporter "sql" do
+      port 20000 + details[:port].to_i
+      service "sql-#{prometheus_suffix}"
+      labels "cluster" => name
+      scrape_interval "1m"
+      scrape_timeout "1m"
+      options "--config.file=/etc/prometheus/exporters/sql_exporter.yml"
+      environment "SQLEXPORTER_TARGET_DSN" => "postgres://prometheus:#{passwords['prometheus']}@/run/postgresql:#{details[:port]}/#{prometheus_database}"
+      restrict_address_families "AF_UNIX"
+      subscribes :restart, "template[/etc/prometheus/exporters/sql_exporter.yml]"
+    end
+  else
+    prometheus_exporter "sql" do
+      action :delete
+      service "sql-#{prometheus_suffix}"
+    end
+
+    file "/etc/prometheus/exporters/sql_exporter.yml" do
+      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
 
     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]


@@ -148,36 +208,9 @@ 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

-
-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
-
-# lag / lag_seconds
-# process_idle missing state
-prometheus_exporter "postgres" do
-  port 9187
-  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_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