podman: revert to using default slirp4netns mtu

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

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 3bf0ad154e6ca39e09a1819a4ca5e06c5bad386c..eae492f16c99cf4f49a5ca1a9a966c6631dbd841 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -18,7 +18,6 @@
 #
 
 include_recipe "apt::postgresql"
 #
 
 include_recipe "apt::postgresql"

-include_recipe "munin"

 include_recipe "prometheus"
 
 package "locales-all"
 include_recipe "prometheus"
 
 package "locales-all"


@@ -108,81 +107,69 @@ 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] || []
 package "pgtop"
 package "libdbd-pg-perl"
 
 clusters = node[:postgresql][:clusters] || []

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

 
 clusters.each do |name, details|
   prometheus_suffix = name.tr("/", "-")
   prometheus_database = node[:postgresql][:monitor_database]
 
 
 clusters.each do |name, details|
   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"
   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]}"
+    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"
     restrict_address_families "AF_UNIX"

-    remove_ipc false

     subscribes :restart, "template[/etc/prometheus/exporters/postgres_queries.yml]"
   end
 
     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
   end
 end

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