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

[chef.git] / cookbooks / prometheus / templates / default / prometheus.yml.erb

diff --git a/cookbooks/prometheus/templates/default/prometheus.yml.erb b/cookbooks/prometheus/templates/default/prometheus.yml.erb
index d90c8292b8a4d3a3ef2041667f2a01d02f48f037..71ccf68a1b9f2136591cae03ad0f40a36120c16c 100644 (file)
--- 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] %>]
@@ -48,5 +46,12 @@ scrape_configs:
 <% end -%>
 <% end -%>
 
-# remote_write:
-#   - url: "http://localhost:9201/write"
+remote_write:
+  - url: "http://localhost:9201/write"
+    write_relabel_configs:
+      - source_labels: [__name__]
+        regex: "go_.*"
+        action: drop
+      - source_labels: [__name__]
+        regex: "promhttp_.*"
+        action: drop