Install promscale extension via apt

diff --git a/cookbooks/prometheus/attributes/default.rb b/cookbooks/prometheus/attributes/default.rb
index 98c3710d694c000a23dcff5aa937185d040b9cb0..7b6feed284033b5363280143a83576ae0fb968ee 100644 (file)
--- 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[:prometheus][:promscale] = true
 
 if node[:recipes].include?("prometheus::server")

-  default[:apt][:sources] |= ["grafana"]
+  default[:apt][:sources] |= %w[grafana timescaledb]

 end
 end

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index d848d80ca7c6014e0b9cf908d8e057b2328f61b8..763c7fa217cc6046a346027a7de28b44100968af 100644 (file)
--- 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
 
   subscribes :extract, "remote_file[#{cache_dir}/karma-linux-amd64.tar.gz]"
 end
 

-package %w[
-  prometheus
-  prometheus-alertmanager
-]
-

 promscale_version = "0.11.0"
 promscale_version = "0.11.0"

-promscale_extension_version = "0.5.0"

 
 database_version = node[:timescaledb][:database_version]
 database_cluster = "#{database_version}/main"
 
 
 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
 postgresql_user "prometheus" do
   cluster database_cluster
   superuser true


@@ -125,19 +125,6 @@ directory "/opt/promscale" do
   mode "755"
 end
 
   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"
 directory "/opt/promscale/bin" do
   owner "root"
   group "root"