X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/252049b26eb93cc876a248ead7347625e5750a26..ab2f9b82009d472b6219d19b0f31e6cab638c769:/cookbooks/prometheus/recipes/server.rb?ds=inline diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb index 69596377e..02bc587d4 100644 --- a/cookbooks/prometheus/recipes/server.rb +++ b/cookbooks/prometheus/recipes/server.rb @@ -111,7 +111,7 @@ archive_file "#{cache_dir}/karma-linux-amd64.tar.gz" do subscribes :extract, "remote_file[#{cache_dir}/karma-linux-amd64.tar.gz]" end -promscale_version = "0.14.0" +promscale_version = "0.16.0" database_version = node[:timescaledb][:database_version] database_cluster = "#{database_version}/main" @@ -158,10 +158,8 @@ systemd_service "promscale" do user "prometheus" 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" - protect_home true - no_new_privileges true + sandbox :enable_network => true + restrict_address_families "AF_UNIX" end if node[:prometheus][:promscale] @@ -347,11 +345,7 @@ systemd_service "prometheus-karma" do description "Alert dashboard for Prometheus Alertmanager" user "prometheus" exec_start "/opt/prometheus-server/karma/karma-linux-amd64 --config.file=/etc/prometheus/karma.yml" - private_tmp true - private_devices true - protect_system "full" - protect_home true - no_new_privileges true + sandbox :enable_network => true restart "on-failure" end @@ -359,6 +353,7 @@ service "prometheus-karma" do action [:enable, :start] subscribes :reload, "template[/etc/prometheus/karma.yml]" subscribes :restart, "archive_file[#{cache_dir}/karma-linux-amd64.tar.gz]" + subscribes :restart, "systemd_service[prometheus-karma]" end package "grafana-enterprise"