X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/47df75c7449f3ca0b81095797ca2098ba7e435d3..38172a795ea0617234fb452133ec51ffbed7a6ac:/cookbooks/prometheus/recipes/server.rb

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index ec23288b3..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.10.0"
-promscale_extension_version = "0.3.0"
+promscale_version = "0.11.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"
@@ -164,41 +151,16 @@ systemd_service "promscale" do
   no_new_privileges true
 end
 
-systemd_service "promscale-maintenance" do
-  description "Promscale Maintenance"
-  type "simple"
-  user "prometheus"
-  exec_start "/usr/bin/psql --command='CALL prom_api.execute_maintenance()' promscale"
-  private_tmp true
-  protect_system "strict"
-  protect_home true
-  no_new_privileges true
-end
-
-systemd_timer "promscale-maintenance" do
-  description "Promscale Maintenace"
-  on_active_sec 1800
-  on_unit_inactive_sec 1800
-end
-
 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|
@@ -229,16 +191,19 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
     if exporter.is_a?(Hash)
       name = exporter[:name]
       address = exporter[:address]
+      sni = exporter[:sni]
       metric_relabel = exporter[:metric_relabel] || []
     else
       name = key
       address = exporter
+      sni = nil
       metric_relabel = []
     end
 
     jobs[name] ||= []
     jobs[name] << {
       :address => address,
+      :sni => sni,
       :instance => client.name.split(".").first,
       :metric_relabel => metric_relabel
     }