X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5f259f2b4c4642dbb43158ab49a9675c2d8ddce7..b5b53aa76974af6ba50160fac6d093149bda6228:/cookbooks/postgresql/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb index 6d966cd33..eae492f16 100644 --- a/cookbooks/postgresql/recipes/default.rb +++ b/cookbooks/postgresql/recipes/default.rb @@ -18,7 +18,6 @@ # include_recipe "apt::postgresql" -include_recipe "munin" include_recipe "prometheus" package "locales-all" @@ -131,7 +130,6 @@ clusters.each do |name, details| labels "cluster" => name scrape_interval "1m" scrape_timeout "1m" - user "postgres" options %w[ --collector.database_wraparound --collector.long_running_transactions @@ -140,49 +138,38 @@ clusters.each do |name, details| --collector.stat_wal_receiver --collector.statio_user_indexes ] - environment "DATA_SOURCE_NAME" => "postgres:///#{prometheus_database}?host=/run/postgresql&port=#{details[:port]}" + environment "DATA_SOURCE_NAME" => "postgres:///#{prometheus_database}?host=/run/postgresql&port=#{details[:port]}&user=prometheus&password=#{passwords['prometheus']}" 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_#{munin_suffix}" do - target "postgres_bgwriter" - conf "munin.erb" - conf_variables :port => details[:port] - end - - munin_plugin "postgres_checkpoints_#{munin_suffix}" do - target "postgres_checkpoints" - conf "munin.erb" - conf_variables :port => details[:port] - end - - munin_plugin "postgres_connections_db_#{munin_suffix}" do - target "postgres_connections_db" - conf "munin.erb" - conf_variables :port => details[:port] - end - - munin_plugin "postgres_users_#{munin_suffix}" do - target "postgres_users" - conf "munin.erb" - conf_variables :port => details[:port] - end - - munin_plugin "postgres_xlog_#{munin_suffix}" do - target "postgres_xlog" - conf "munin.erb" - conf_variables :port => details[:port] - end + 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 - next unless File.exist?("/var/lib/postgresql/#{details[:version]}/main/recovery.conf") + 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 - munin_plugin "postgres_replication_#{munin_suffix}" do - target "postgres_replication" - conf "munin.erb" - conf_variables :port => details[:port] + file "/etc/prometheus/exporters/sql_exporter.yml" do + action :delete + end end end