X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/0e7da82b51159c50f4cf6531618aaea1637d371e..cd3653225c75a743806ae73b473eda8a2a93724e:/cookbooks/prometheus/recipes/server.rb

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index ccb12528d..9414eec12 100644
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -37,9 +37,10 @@ package %w[
   prometheus-alertmanager
 ]
 
-promscale_version = "0.3.0"
+promscale_version = "0.6.2"
 
-database_cluster = "#{node[:timescaledb][:database_version]}/main"
+database_version = node[:timescaledb][:database_version]
+database_cluster = "#{database_version}/main"
 
 postgresql_user "prometheus" do
   cluster database_cluster
@@ -57,30 +58,11 @@ directory "/opt/promscale" do
   mode "755"
 end
 
-package %w[
-  make
-  gcc
-  clang-9
-  llvm-9
-  cargo
-]
-
-git "/opt/promscale/extension" do
-  action :sync
-  repository "https://github.com/timescale/promscale_extension.git"
-  revision "0.1.1"
-  user "root"
-  group "root"
-end
-
-execute "/opt/promscale/extension/Makefile" do
-  action :nothing
-  command "make install"
-  cwd "/opt/promscale/extension"
-  user "root"
+cookbook_file "/usr/lib/postgresql/#{database_version}/lib/promscale.so" do
+  source "postgresql-#{database_version}-promscale.so"
+  owner "root"
   group "root"
-  subscribes :run, "git[/opt/promscale/extension]", :immediately
-  notifies :restart, "service[postgresql]", :immediately
+  mode "644"
 end
 
 directory "/opt/promscale/bin" do
@@ -101,7 +83,7 @@ systemd_service "promscale" do
   description "Promscale Connector"
   type "simple"
   user "prometheus"
-  exec_start "/opt/promscale/bin/promscale --db-host /run/postgresql --db-port 5432 --db-user prometheus --db-name promscale --db-connections-max 400"
+  exec_start "/opt/promscale/bin/promscale --db-uri postgresql:///promscale?host=/run/postgresql&port=5432 --db-connections-max 400"
   # exec_start lazy { "/opt/promscale/bin/promscale --db-host /run/postgresql --db-port #{node[:postgresql][:clusters][database_cluster][:port]} --db-user prometheus --db-name promscale --db-max-connections 400" }
   limit_nofile 16384
   private_tmp true
@@ -117,7 +99,7 @@ service "promscale" do
 end
 
 systemd_service "promscale-maintenance" do
-  description "Promscale Maintenace"
+  description "Promscale Maintenance"
   type "simple"
   user "prometheus"
   exec_start "/usr/bin/psql --command='CALL prom_api.execute_maintenance()' promscale"