From eac7c4595d76c945d11e88c77bd6f76aa69cab16 Mon Sep 17 00:00:00 2001 From: graemej Date: Mon, 14 Apr 2014 17:59:51 -0400 Subject: [PATCH 1/2] add custom emitters Signed-off-by: Arthur Neves --- attributes/default.rb | 3 +++ templates/default/datadog.conf.erb | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/attributes/default.rb b/attributes/default.rb index 39b51df2..7a38abbe 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -99,6 +99,9 @@ # log-parsing configuration default['datadog']['dogstreams'] = [] +# custom emitter configuration +default['datadog']['custom_emitters'] = [] + # Logging configuration default['datadog']['syslog']['active'] = false default['datadog']['syslog']['udp'] = false diff --git a/templates/default/datadog.conf.erb b/templates/default/datadog.conf.erb index 21f2c090..52b46d40 100644 --- a/templates/default/datadog.conf.erb +++ b/templates/default/datadog.conf.erb @@ -27,6 +27,10 @@ non_local_traffic: true dogstreams: <%= node['datadog']['dogstreams'].join(', ') %> <% end -%> +<% if !node['datadog']['custom_emitters'].empty? -%> +custom_emitters: <%= node['datadog']['custom_emitters'].join(', ') %> +<% end -%> + <% if node['datadog']['graphite'] -%> graphite_listen_port: <%= node['datadog']['graphite_port'] %> <% end -%> From cb440c1cf44c6fde0f38ec4128636d532c3dfd93 Mon Sep 17 00:00:00 2001 From: graemej Date: Wed, 20 Aug 2014 10:34:23 -0400 Subject: [PATCH 2/2] add ability to specify agent_check_interval --- templates/default/datadog.conf.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/default/datadog.conf.erb b/templates/default/datadog.conf.erb index 52b46d40..1f7d980c 100644 --- a/templates/default/datadog.conf.erb +++ b/templates/default/datadog.conf.erb @@ -31,6 +31,10 @@ dogstreams: <%= node['datadog']['dogstreams'].join(', ') %> custom_emitters: <%= node['datadog']['custom_emitters'].join(', ') %> <% end -%> +<% if node['datadog']['agent_checks_interval'] -%> +agent_checks_interval: <%= node['datadog']['agent_checks_interval'] %> +<% end -%> + <% if node['datadog']['graphite'] -%> graphite_listen_port: <%= node['datadog']['graphite_port'] %> <% end -%>