Merge remote-tracking branch 'github/pull/388'

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

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index e4689dbf15346468154e4b3e8a2b73a51368369b..b4a4c36da45428f2f237a8b10de2f2ff1750eee6 100644 (file)
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -39,7 +39,7 @@ package %w[
 
 promscale_version = "0.1.4"
 
-database_cluster = node[:timescaledb][:cluster]
+database_cluster = "#{node[:timescaledb][:database_version]}/main"
 
 postgresql_user "prometheus" do
   cluster database_cluster
@@ -144,8 +144,24 @@ systemd_timer "promscale-maintenance" do
   on_unit_inactive_sec 1800
 end
 
+service "promscale-maintenance.timer" do
+  action [:enable, :start]
+end
+
 jobs = {}
 
+search(:node, "roles:gateway") do |gateway|
+  allowed_ips = gateway.interfaces(:role => :internal).map do |interface|
+    "#{interface[:network]}/#{interface[:prefix]}"
+  end
+
+  node.default[:networking][:wireguard][:peers] << {
+    :public_key => gateway[:networking][:wireguard][:public_key],
+    :allowed_ips => allowed_ips,
+    :endpoint => "#{gateway.name}:51820"
+  }
+end
+
 search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client|
   if client[:prometheus][:mode] == "wireguard"
     node.default[:networking][:wireguard][:peers] << {
@@ -257,3 +273,10 @@ end
 apache_site "prometheus.openstreetmap.org" do
   template "apache.erb"
 end
+
+template "/etc/cron.daily/prometheus-backup" do
+  source "backup.cron.erb"
+  owner "root"
+  group "root"
+  mode "750"
+end