apache: use new combined_extended log format instead of combined

[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 922fa123b2b9c1fb51324acf70a83f3de7758f33..02ade7d8e225d9e94dd7b2df6bbd6bbc3f9929d8 100644 (file)
--- a/cookbooks/prometheus/templates/default/prometheus.yml.erb
+++ b/cookbooks/prometheus/templates/default/prometheus.yml.erb
@@ -72,7 +72,7 @@ scrape_configs:
           - "<%= target[:address] %>"
         labels:
           instance: <%= target[:instance] %>
           - "<%= target[:address] %>"
         labels:
           instance: <%= target[:instance] %>

-<% Hash(target[:labels]).sort.each do |name, value| -%>
+<% target[:labels].sort.each do |name, value| -%>

           <%= name %>: <%= value %>
 <% end -%>
 <% end -%>
           <%= name %>: <%= value %>
 <% end -%>
 <% end -%>


@@ -85,6 +85,26 @@ scrape_configs:
 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>
 <% end -%>

+  - job_name: junos
+    scrape_interval: 5m
+    scrape_timeout: 4m
+    static_configs:
+<% @junos_targets.sort_by { |t| t[:instance] }.each do |target| -%>
+      - targets:
+          - "<%= target[:target] %>/<%= target[:address] %>"
+        labels:
+          instance: <%= target[:instance] %>
+<% target[:labels].sort.each do |name, value| -%>
+          <%= name %>: <%= value %>
+<% end -%>
+<% end -%>
+    relabel_configs:
+      - source_labels: [__address__]
+        regex: "([^/]+)/.*"
+        target_label: __param_target
+      - source_labels: [__address__]
+        regex: "[^/]+/(.*)"
+        target_label: __address__

   - job_name: snmp
     scrape_interval: 5m
     scrape_timeout: 2m
   - job_name: snmp
     scrape_interval: 5m
     scrape_timeout: 2m