Avoid changing postgres configuration on prometheus clients

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index d349495ab74dd1ebd1587f06ae1da0779ec3449b..b4a4c36da45428f2f237a8b10de2f2ff1750eee6 100644 (file)
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -39,7 +39,7 @@ package %w[
 
 promscale_version = "0.1.4"
 
-database_cluster = node[:timescaledb][:cluster]
+database_cluster = "#{node[:timescaledb][:database_version]}/main"
 
 postgresql_user "prometheus" do
   cluster database_cluster

diff --git a/cookbooks/timescaledb/attributes/default.rb b/cookbooks/timescaledb/attributes/default.rb
index 9d8095ec1fe69d5c30524fdd3ca42f53f5e569b7..004dda60a3288229ca76f9da8c2ed2f8e5589792 100644 (file)
--- a/cookbooks/timescaledb/attributes/default.rb
+++ b/cookbooks/timescaledb/attributes/default.rb
@@ -1,33 +1,4 @@
-default[:timescaledb][:cluster] = "12/main"
+default[:timescaledb][:database_version] = "12"
 default[:timescaledb][:max_background_workers] = 8
 
-database_version = node[:timescaledb][:cluster].split("/").first
-
 default[:apt][:sources] |= ["timescaledb"]
-
-memory_gb = (node[:memory][:total].to_f / 1024 / 1024).ceil
-
-default_unless[:postgresql][:versions] = []
-default[:postgresql][:versions] |= [database_version]
-default[:postgresql][:settings][database_version][:max_connections] = 500
-default[:postgresql][:settings][database_version][:shared_buffers] = "#{memory_gb / 4}GB"
-default[:postgresql][:settings][database_version][:work_mem] = "#{memory_gb * 128 / 50 / node[:cpu][:total]}MB"
-default[:postgresql][:settings][database_version][:maintenance_work_mem] = "2GB"
-default[:postgresql][:settings][database_version][:effective_io_concurrency] = "200"
-default[:postgresql][:settings][database_version][:max_worker_processes] = node[:cpu][:total] + node[:timescaledb][:max_background_workers] + 3
-default[:postgresql][:settings][database_version][:max_parallel_workers_per_gather] = node[:cpu][:total] / 2
-default[:postgresql][:settings][database_version][:max_parallel_workers] = node[:cpu][:total]
-default[:postgresql][:settings][database_version][:wal_buffers] = "16MB"
-default[:postgresql][:settings][database_version][:max_wal_size] = "1GB"
-default[:postgresql][:settings][database_version][:min_wal_size] = "512MB"
-default[:postgresql][:settings][database_version][:checkpoint_completion_target] = "0.9"
-default[:postgresql][:settings][database_version][:random_page_cost] = "1.1"
-default[:postgresql][:settings][database_version][:effective_cache_size] = "#{memory_gb * 3 / 4}GB"
-default[:postgresql][:settings][database_version][:default_statistics_target] = "500"
-default[:postgresql][:settings][database_version][:autovacuum_max_workers] = "10"
-default[:postgresql][:settings][database_version][:autovacuum_naptime] = "10"
-default_unless[:postgresql][:settings][database_version][:shared_preload_libraries] = []
-default[:postgresql][:settings][database_version][:shared_preload_libraries] |= ["timescaledb"]
-default[:postgresql][:settings][database_version][:max_locks_per_transaction] = "512"
-default_unless[:postgresql][:settings][database_version][:customized_options] = {}
-default[:postgresql][:settings][database_version][:customized_options]["timescaledb.max_background_workers"] = node[:timescaledb][:max_background_workers]

diff --git a/cookbooks/timescaledb/recipes/default.rb b/cookbooks/timescaledb/recipes/default.rb
index 7b2defdcacbdc826e46dbe6cbafbc936e23960b9..4ae90c361c7966afb0b87dabf815e096b15683cb 100644 (file)
--- a/cookbooks/timescaledb/recipes/default.rb
+++ b/cookbooks/timescaledb/recipes/default.rb
@@ -19,9 +19,38 @@
 
 include_recipe "apt"
 
-package %w[
+database_version = node[:timescaledb][:database_version]
+
+package %W[
   timescaledb-tools
-  timescaledb-2-postgresql-12
+  timescaledb-2-postgresql-#{database_version}
 ]
 
+memory_gb = (node[:memory][:total].to_f / 1024 / 1024).ceil
+
+node.default_unless[:postgresql][:versions] = []
+node.default[:postgresql][:versions] |= [database_version]
+node.default[:postgresql][:settings][database_version][:max_connections] = 500
+node.default[:postgresql][:settings][database_version][:shared_buffers] = "#{memory_gb / 4}GB"
+node.default[:postgresql][:settings][database_version][:work_mem] = "#{memory_gb * 128 / 50 / node[:cpu][:total]}MB"
+node.default[:postgresql][:settings][database_version][:maintenance_work_mem] = "2GB"
+node.default[:postgresql][:settings][database_version][:effective_io_concurrency] = "200"
+node.default[:postgresql][:settings][database_version][:max_worker_processes] = node[:cpu][:total] + node[:timescaledb][:max_background_workers] + 3
+node.default[:postgresql][:settings][database_version][:max_parallel_workers_per_gather] = node[:cpu][:total] / 2
+node.default[:postgresql][:settings][database_version][:max_parallel_workers] = node[:cpu][:total]
+node.default[:postgresql][:settings][database_version][:wal_buffers] = "16MB"
+node.default[:postgresql][:settings][database_version][:max_wal_size] = "1GB"
+node.default[:postgresql][:settings][database_version][:min_wal_size] = "512MB"
+node.default[:postgresql][:settings][database_version][:checkpoint_completion_target] = "0.9"
+node.default[:postgresql][:settings][database_version][:random_page_cost] = "1.1"
+node.default[:postgresql][:settings][database_version][:effective_cache_size] = "#{memory_gb * 3 / 4}GB"
+node.default[:postgresql][:settings][database_version][:default_statistics_target] = "500"
+node.default[:postgresql][:settings][database_version][:autovacuum_max_workers] = "10"
+node.default[:postgresql][:settings][database_version][:autovacuum_naptime] = "10"
+node.default_unless[:postgresql][:settings][database_version][:shared_preload_libraries] = []
+node.default[:postgresql][:settings][database_version][:shared_preload_libraries] |= ["timescaledb"]
+node.default[:postgresql][:settings][database_version][:max_locks_per_transaction] = "512"
+node.default_unless[:postgresql][:settings][database_version][:customized_options] = {}
+node.default[:postgresql][:settings][database_version][:customized_options]["timescaledb.max_background_workers"] = node[:timescaledb][:max_background_workers]
+
 include_recipe "postgresql"