Drop role and cookbook for the old tile CDN

[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 812f3229913fb16fae1686a9f9469d9ec00610b9..d5a8debaf5f4eff2f2f1a56ea89c5d7ec2d0579a 100644 (file)
--- a/cookbooks/prometheus/templates/default/prometheus.yml.erb
+++ b/cookbooks/prometheus/templates/default/prometheus.yml.erb
@@ -75,7 +75,7 @@ scrape_configs:
 <% end -%>
   - job_name: snmp
     scrape_interval: 5m
-    scrape_timeout: 1m
+    scrape_timeout: 2m
     metrics_path: /snmp
     static_configs:
       - targets:
@@ -84,6 +84,9 @@ scrape_configs:
           - "<%= target[:target] %>/<%= target[:module] %>/<%= target[:address] %>"
         labels:
           instance: <%= target[:instance] %>
+<% target[:labels].sort.each do |name, value| -%>
+          <%= name %>: <%= value %>
+<% end -%>
 <% end -%>
     relabel_configs:
       - source_labels: [__address__]