From: Tom Hughes <tom@compton.nu>
Date: Thu, 19 May 2022 20:50:26 +0000 (+0100)
Subject: Install promscale extension via apt
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/49a3d938c0182a09dbe33242fe52826b4de5bcce

Install promscale extension via apt
---

diff --git a/cookbooks/prometheus/attributes/default.rb b/cookbooks/prometheus/attributes/default.rb
index 98c3710d6..7b6feed28 100644
--- a/cookbooks/prometheus/attributes/default.rb
+++ b/cookbooks/prometheus/attributes/default.rb
@@ -6,5 +6,5 @@ default[:prometheus][:files] = []
 default[:prometheus][:promscale] = true
 
 if node[:recipes].include?("prometheus::server")
-  default[:apt][:sources] |= ["grafana"]
+  default[:apt][:sources] |= %w[grafana timescaledb]
 end
diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index d848d80ca..763c7fa21 100644
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -98,17 +98,17 @@ archive_file "#{cache_dir}/karma-linux-amd64.tar.gz" do
   subscribes :extract, "remote_file[#{cache_dir}/karma-linux-amd64.tar.gz]"
 end
 
-package %w[
-  prometheus
-  prometheus-alertmanager
-]
-
 promscale_version = "0.11.0"
-promscale_extension_version = "0.5.0"
 
 database_version = node[:timescaledb][:database_version]
 database_cluster = "#{database_version}/main"
 
+package %W[
+  prometheus
+  prometheus-alertmanager
+  promscale-extension-postgresql-#{database_version}
+]
+
 postgresql_user "prometheus" do
   cluster database_cluster
   superuser true
@@ -125,19 +125,6 @@ directory "/opt/promscale" do
   mode "755"
 end
 
-remote_file "#{cache_dir}/promscale_extension.pg#{database_version}.x86_64.deb" do
-  source "https://github.com/timescale/promscale_extension/releases/download/#{promscale_extension_version}/promscale_extension-#{promscale_extension_version}.pg#{database_version}.x86_64.deb"
-  owner "root"
-  group "root"
-  mode "644"
-  backup false
-end
-
-dpkg_package "promscale-extension-postgresql-#{database_version}" do
-  source "#{cache_dir}/promscale_extension.pg#{database_version}.x86_64.deb"
-  version "#{promscale_extension_version}-1"
-end
-
 directory "/opt/promscale/bin" do
   owner "root"
   group "root"