Drop promscale-maintenace service as it is no longer needed

[chef.git] / cookbooks / prometheus / recipes / server.rb

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index 75ade71beb7b22176cdd3eca3c0006dd75c76fc9..045e9ff34e00ab09a09caf83c0d528eb1cb60e1e 100644 (file)
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -103,8 +103,8 @@ package %w[
   prometheus-alertmanager
 ]
 
-promscale_version = "0.7.1"
-promscale_extension_version = "0.3.0"
+promscale_version = "0.10.0"
+promscale_extension_version = "0.3.2"
 
 database_version = node[:timescaledb][:database_version]
 database_cluster = "#{database_version}/main"
@@ -156,8 +156,7 @@ systemd_service "promscale" do
   description "Promscale Connector"
   type "simple"
   user "prometheus"
-  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" }
+  exec_start "/opt/promscale/bin/promscale --db.uri postgresql:///promscale?host=/run/postgresql&port=5432 --db.connections-max 400"
   limit_nofile 16384
   private_tmp true
   protect_system "strict"
@@ -165,41 +164,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|
@@ -230,16 +204,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
     }