From: Tom Hughes <tom@compton.nu>
Date: Mon, 25 Jan 2021 13:51:13 +0000 (+0000)
Subject: Apply relabelling to correct jobs
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/a659d96dbbc47581005c714255954b503c784b73

Apply relabelling to correct jobs
---

diff --git a/cookbooks/prometheus/templates/default/prometheus.yml.erb b/cookbooks/prometheus/templates/default/prometheus.yml.erb
index d90c8292b..e06c02549 100644
--- a/cookbooks/prometheus/templates/default/prometheus.yml.erb
+++ b/cookbooks/prometheus/templates/default/prometheus.yml.erb
@@ -35,10 +35,8 @@ scrape_configs:
           - "<%= target[:address] %>"
         labels:
           instance: <%= target[:instance] %>
-<% end -%>
 <% end -%>
     metric_relabel_configs:
-<% @jobs.sort.each do |name, targets| -%>
 <% targets.each do |target| -%>
 <% target[:metric_relabel].each do |relabel| -%>
       - source_labels: [instance,<%= relabel[:source_labels] %>]