diff --git a/site-cookbooks/kosmos_prometheus/recipes/server.rb b/site-cookbooks/kosmos_prometheus/recipes/server.rb index a7b2bb1..345bd94 100644 --- a/site-cookbooks/kosmos_prometheus/recipes/server.rb +++ b/site-cookbooks/kosmos_prometheus/recipes/server.rb @@ -79,6 +79,7 @@ jobs = node["kosmos_prometheus"]["jobs"].merge( "targets" => search(:node, config["query"]).map do |n| target = { "target" => "#{n['knife_zero']['host']}:#{config['port']}", "instance" => n.name } target["env"] = n.chef_environment if n.chef_environment + target["vm_host"] = n["vm_host"] if n["vm_host"] target end.compact.sort_by { |t| t["instance"] }, } diff --git a/site-cookbooks/kosmos_prometheus/templates/default/prometheus.yml.erb b/site-cookbooks/kosmos_prometheus/templates/default/prometheus.yml.erb index 9cc3ea4..a7bd9f3 100644 --- a/site-cookbooks/kosmos_prometheus/templates/default/prometheus.yml.erb +++ b/site-cookbooks/kosmos_prometheus/templates/default/prometheus.yml.erb @@ -36,6 +36,9 @@ scrape_configs: <% if t['env'] %> env: <%= t['env'] %> <% end %> +<% if t['vm_host'] %> + vm_host: <%= t['vm_host'] %> +<% end %> <% end %> <% end %>