X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ab47927c016597f8602b81dcdc168ad5c335389d..06f75772a25febcfd00bfb8607ce3931520adb22:/cookbooks/prometheus/templates/default/chef.prom.erb?ds=inline diff --git a/cookbooks/prometheus/templates/default/chef.prom.erb b/cookbooks/prometheus/templates/default/chef.prom.erb index 13b753ef1..8d6506eae 100644 --- a/cookbooks/prometheus/templates/default/chef.prom.erb +++ b/cookbooks/prometheus/templates/default/chef.prom.erb @@ -1,15 +1,15 @@ # 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 <% node[:roles].sort.each do |role| -%> chef_role{name="<%= role %>"} 1 <% end -%> -<% if node[:roles].include?("tilecache") -%> -# HELP chef_tile_parent Information about tile cache parents -# TYPE chef_tile_parent gauge -chef_tile_parent{name="<%= node[:tilecache][:tile_parent].split(".").first %>"} 1 +<% node[:prometheus][:metrics].sort.each do |name, details| -%> +# HELP <%= name %> <%= details[:help] %> +# TYPE <%= name %> gauge +<%= name %>{<%= Hash(details[:labels]).map { |k,v| "#{k}=\"#{v}\"" }.join(",") %>} <%= details[:metric] || 1 %> <% end -%>