add option to specify ec2 tag collection

DataDog · Dec 4, 2014 · fc785ae · fc785ae
1 parent 5f8e261
commit fc785ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -33,6 +33,9 @@
 # Add tags as override attributes in your role
 default['datadog']['tags'] = ''
 
+# Collect EC2 tags
+default['datadog']['collect_ec2_tags'] = 'no'
+
 # Autorestart agent
 default['datadog']['autorestart'] = false
 

diff --git a/templates/default/datadog.conf.erb b/templates/default/datadog.conf.erb
@@ -11,7 +11,12 @@ listen_port: <%= node['datadog']['agent_port'] %>
 <% if node['datadog']['autorestart'] -%>
 autorestart: <%= node['datadog']['autorestart'] %>
 <% end -%>
+
 tags: <%= node['datadog']['tags'] %>
+<% if node['datadog']['collect_ec2_tags'] -%>
+collect_ec2_tags: <%= node['datadog']['collect_ec2_tags'] %>
+<% end -%>
+
 <% if node['datadog']['web_proxy']['host'] -%>
 proxy_host: <%= node['datadog']['web_proxy']['host'] %>
 proxy_port: <%= node['datadog']['web_proxy']['port'] %>