X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/bb670c9eb8501639d3073dfa54c2d921ca8da5ee..fa01b23a314f36ccbe94f318dd424578f96f6411:/cookbooks/prometheus/recipes/server.rb?ds=sidebyside

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index c8241a1f1..f9aab32b3 100644
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -37,9 +37,10 @@ package %w[
   prometheus-alertmanager
 ]
 
-promscale_version = "0.2.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
@@ -110,14 +92,8 @@ systemd_service "promscale" do
   no_new_privileges true
 end
 
-service "promscale" do
-  action [:enable, :start]
-  subscribes :restart, "remote_file[/opt/promscale/bin/promscale]"
-  subscribes :restart, "systemd_service[promscale]"
-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"
@@ -133,8 +109,24 @@ systemd_timer "promscale-maintenance" do
   on_unit_inactive_sec 1800
 end
 
-service "promscale-maintenance.timer" do
-  action [:enable, :start]
+if node[:prometheus][:promscale]
+  service "promscale" do
+    action [:enable, :start]
+    subscribes :restart, "remote_file[/opt/promscale/bin/promscale]"
+    subscribes :restart, "systemd_service[promscale]"
+  end
+
+  service "promscale-maintenance.timer" do
+    action [:enable, :start]
+  end
+else
+  service "promscale" do
+    action [:disable, :stop]
+  end
+
+  service "promscale-maintenance.timer" do
+    action [:disable, :stop]
+  end
 end
 
 search(:node, "roles:gateway") do |gateway|
@@ -185,7 +177,8 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
       :instance => instance,
       :target => details[:address],
       :module => details[:module],
-      :address => client[:prometheus][:addresses]["snmp"]
+      :address => client[:prometheus][:addresses]["snmp"],
+      :labels => Array(details[:labels])
     }
   end
 end