Revert "Disable collection of bgwriter statistics for postgres 17"

This reverts commit da3e292dc325b96df2c805d729427c8bf6741b81.

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 742941ee9161a224769121bad55dfd6f6a4bfa07..eae492f16c99cf4f49a5ca1a9a966c6631dbd841 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -124,24 +124,20 @@ 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 exporter_options
+    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]"