Add support for granting roles to postgres users

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

diff --git a/cookbooks/postgresql/recipes/default.rb b/cookbooks/postgresql/recipes/default.rb
index 3bf0ad154e6ca39e09a1819a4ca5e06c5bad386c..9f713b60e9834f28300df03169dd31a7d323fe92 100644 (file)
--- a/cookbooks/postgresql/recipes/default.rb
+++ b/cookbooks/postgresql/recipes/default.rb
@@ -108,11 +108,8 @@ ohai_plugin "postgresql" do
   template "ohai.rb.erb"
 end
 
-template "/etc/prometheus/exporters/postgres_queries.yml" do
-  source "postgres_queries.yml.erb"
-  owner "root"
-  group "root"
-  mode "644"
+file "/etc/prometheus/exporters/postgres_queries.yml" do
+  action :delete
 end
 
 package "pgtop"
@@ -131,7 +128,14 @@ clusters.each do |name, details|
     scrape_interval "1m"
     scrape_timeout "1m"
     user "postgres"
-    options "--no-collector.process_idle --extend.query-path=/etc/prometheus/exporters/postgres_queries.yml"
+    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]}"
     restrict_address_families "AF_UNIX"
     remove_ipc false