X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3a31afdddc4082bd26bc0840ef53c1f77ad75c31..143160f8b3b63f5a43f02c41ec07e782b71f23b4:/cookbooks/prometheus/recipes/server.rb

diff --git a/cookbooks/prometheus/recipes/server.rb b/cookbooks/prometheus/recipes/server.rb
index 2ebf5a823..7e4f4b2bf 100644
--- a/cookbooks/prometheus/recipes/server.rb
+++ b/cookbooks/prometheus/recipes/server.rb
@@ -159,13 +159,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
 
@@ -218,6 +224,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
@@ -244,3 +257,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