From fa01b23a314f36ccbe94f318dd424578f96f6411 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 17 Nov 2021 17:14:22 +0000 Subject: [PATCH] Disable promscale for now --- cookbooks/prometheus/attributes/default.rb | 1 + cookbooks/prometheus/recipes/server.rb | 26 +++++++++++++++------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/cookbooks/prometheus/attributes/default.rb b/cookbooks/prometheus/attributes/default.rb index a239c6a19..d95325fde 100644 --- a/cookbooks/prometheus/attributes/default.rb +++ b/cookbooks/prometheus/attributes/default.rb @@ -3,6 +3,7 @@ default[:prometheus][:exporters] = {} default[:prometheus][:snmp] = {} default[:prometheus][:metrics] = {} default[:prometheus][:files] = [] +default[:prometheus][:promscale] = false if node[:recipes].include?("prometheus::server") default[:apt][:sources] |= ["grafana"] diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb index 9414eec12..f9aab32b3 100644 --- a/cookbooks/prometheus/recipes/server.rb +++ b/cookbooks/prometheus/recipes/server.rb @@ -92,12 +92,6 @@ 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 Maintenance" type "simple" @@ -115,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| -- 2.45.1