X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/778dafe1b60675abedacec30bbbec1e174fec5b0..12b6ad1994988ab8699d278e27630af439872f5a:/cookbooks/prometheus/recipes/server.rb

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index d069cd8e7..b4a4c36da 100644
--- 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] << {
@@ -159,13 +175,19 @@ search(:node, "recipes:prometheus\\:\\:default").sort_by(&:name).each do |client
     if exporter.is_a?(Hash)
       name = exporter[:name]
       address = exporter[:address]
+      metric_relabel = exporter[:metric_relabel] || []
     else
       name = key
       address = exporter
+      metric_relabel = []
     end
 
     jobs[name] ||= []
-    jobs[name] << { :address => address, :name => client.name }
+    jobs[name] << {
+      :address => address,
+      :instance => client.name.split(".").first,
+      :metric_relabel => metric_relabel
+    }
   end
 end
 
@@ -184,10 +206,18 @@ template "/etc/prometheus/prometheus.yml" do
   variables :jobs => jobs
 end
 
+template "/etc/prometheus/alert_rules.yml" do
+  source "alert_rules.yml.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
 service "prometheus" do
   action [:enable, :start]
   subscribes :restart, "template[/etc/default/prometheus]"
   subscribes :reload, "template[/etc/prometheus/prometheus.yml]"
+  subscribes :reload, "template[/etc/prometheus/alert_rules.yml]"
 end
 
 template "/etc/default/prometheus-alertmanager" do
@@ -210,6 +240,13 @@ service "prometheus-alertmanager" do
   subscribes :reload, "template[/etc/prometheus/alertmanager.yml]"
 end
 
+template "/etc/prometheus/amtool.yml" do
+  source "amtool.yml.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
 package "grafana-enterprise"
 
 template "/etc/grafana/grafana.ini" do
@@ -236,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