X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/86c44e026acbb13f331c78f72b16d0efb5cc2e81..a8151a769c86a3f482651f2b82c463bab1c0261e:/cookbooks/prometheus/recipes/server.rb diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb index bd1f3b50c..612b404cb 100644 --- a/cookbooks/prometheus/recipes/server.rb +++ b/cookbooks/prometheus/recipes/server.rb @@ -37,13 +37,13 @@ package %w[ prometheus-alertmanager ] -promscale_version = "0.1.4" +promscale_version = "0.2.0" -database_cluster = node[:timescaledb][:cluster] +database_cluster = "#{node[:timescaledb][:database_version]}/main" postgresql_user "prometheus" do cluster database_cluster - createrole true + superuser true end postgresql_database "promscale" do @@ -51,11 +51,6 @@ postgresql_database "promscale" do owner "prometheus" end -postgresql_extension "timescaledb" do - cluster database_cluster - database "promscale" -end - directory "/opt/promscale" do owner "root" group "root" @@ -121,12 +116,6 @@ service "promscale" do subscribes :restart, "systemd_service[promscale]" end -postgresql_extension "promscale" do - cluster database_cluster - database "promscale" - notifies :restart, "service[promscale]" -end - systemd_service "promscale-maintenance" do description "Promscale Maintenace" type "simple" @@ -144,7 +133,9 @@ systemd_timer "promscale-maintenance" do on_unit_inactive_sec 1800 end -jobs = {} +service "promscale-maintenance.timer" do + action [:enable, :start] +end search(:node, "roles:gateway") do |gateway| allowed_ips = gateway.interfaces(:role => :internal).map do |interface| @@ -158,6 +149,8 @@ search(:node, "roles:gateway") do |gateway| } end +jobs = {} + search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client| if client[:prometheus][:mode] == "wireguard" node.default[:networking][:wireguard][:peers] << { @@ -187,6 +180,32 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client end end +certificates = search(:node, "letsencrypt:certificates").each_with_object({}) do |n, c| + n[:letsencrypt][:certificates].each do |name, details| + c[name] ||= details.merge(:nodes => []) + + c[name][:nodes] << { + :name => n[:fqdn], + :address => n.external_ipaddress || n.internal_ipaddress + } + end +end + +template "/etc/prometheus/ssl.yml" do + source "ssl.yml.erb" + owner "root" + group "root" + mode "644" + variables :certificates => certificates +end + +prometheus_exporter "ssl" do + address "127.0.0.1" + port 9219 + options "--config.file=/etc/prometheus/ssl.yml" + register_target false +end + template "/etc/default/prometheus" do source "default.prometheus.erb" owner "root" @@ -199,7 +218,7 @@ template "/etc/prometheus/prometheus.yml" do owner "root" group "root" mode "644" - variables :jobs => jobs + variables :jobs => jobs, :certificates => certificates end template "/etc/prometheus/alert_rules.yml" do