X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e909b020604a52f20f78d0980bbfc93252f384e0..c590ff1934c8f557a5f844c482daae5f672bddcf:/cookbooks/postgresql/recipes/default.rb

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 086047258..742941ee9 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"
@@ -125,20 +124,24 @@ clusters.each do |name, details|
     not_if { ::File.exist?("/var/lib/postgresql/#{name}/standby.signal") }
   end
 
+  exporter_options = %w[
+    --collector.database_wraparound
+    --collector.long_running_transactions
+    --collector.process_idle
+    --collector.stat_activity_autovacuum
+    --collector.stat_wal_receiver
+    --collector.statio_user_indexes
+  ]
+
+  exporter_options << "--no-collector.stat_bgwriter" if details[:version] >= 17
+
   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
-    ]
+    options exporter_options
     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]"
@@ -173,44 +176,4 @@ clusters.each do |name, details|
       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
-
-  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
-
-  next unless File.exist?("/var/lib/postgresql/#{details[:version]}/main/recovery.conf")
-
-  munin_plugin "postgres_replication_#{munin_suffix}" do
-    target "postgres_replication"
-    conf "munin.erb"
-    conf_variables :port => details[:port]
-  end
 end