X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/fa63c845987967418edaff22b75958916b19f19a..2835205c501da417ff80ce4f06dc32d14c8c38bb:/cookbooks/prometheus/templates/default/chef.prom.erb diff --git a/cookbooks/prometheus/templates/default/chef.prom.erb b/cookbooks/prometheus/templates/default/chef.prom.erb index f9be619f0..8d6506eae 100644 --- a/cookbooks/prometheus/templates/default/chef.prom.erb +++ b/cookbooks/prometheus/templates/default/chef.prom.erb @@ -1,7 +1,7 @@ # HELP chef_network_interface Information about network interfaces # TYPE chef_network_interface gauge -<% node.interfaces do |interface| -%> -chef_network_interface{name="<%= interface[:interface] %>",role="<%= interface[:role].to_s %>",family="<%= interface[:family].to_s %>"} 1 +<% node.interfaces.each do |interface| -%> +chef_network_interface{name="<%= interface[:interface] %>",role="<%= interface[:role].to_s %>"} 1 <% end -%> # HELP chef_role Information about chef roles # TYPE chef_role gauge @@ -11,5 +11,5 @@ chef_role{name="<%= role %>"} 1 <% node[:prometheus][:metrics].sort.each do |name, details| -%> # HELP <%= name %> <%= details[:help] %> # TYPE <%= name %> gauge -<%= name %>{<%= details[:labels].map { |k,v| "#{k}=\"#{v}\"" }.join(",") %>} 1 +<%= name %>{<%= Hash(details[:labels]).map { |k,v| "#{k}=\"#{v}\"" }.join(",") %>} <%= details[:metric] || 1 %> <% end -%>