Skip to content

Commit

Permalink
Merge pull request #37 from dcrosta/dogstreams
Browse files Browse the repository at this point in the history
add attribute to configure dogstreams in datadog.conf
  • Loading branch information
miketheman committed Dec 27, 2012
2 parents 3b6422a + 6f6acbd commit 59fc30f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ Attributes
* `node['datadog']['use_ec2_instance_id']` = Whether to use the instance-id in lieu of hostname when running on EC2. No effect on non-EC2 servers.
* `node['datadog']['use_mount']` = Whether to use the mount point instead of the device name for all I/O metrics.
* `node['datadog']['tags']` = List of Datadog tags you want to apply to this host
* `node['datadog']['dogstreams']` = List of Dogstreams (see [Guide to Log Parsing](http://docs.datadoghq.com/guides/logs/) for details).

apache
-------
Expand Down
3 changes: 3 additions & 0 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@
default['datadog']['dogstatsd_port'] = 8125
default['datadog']['dogstatsd_interval'] = 10

# Set up dogstreams
default['datadog']['dogstreams'] = []

##
# Service specific attributes, use override in node/role configuration
##
Expand Down
3 changes: 3 additions & 0 deletions templates/default/datadog.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ use_mount: <%= node['datadog']['use_mount'] ? "yes" : "no" %>
listen_port: <%= node['datadog']['agent_port'] %>
tags: <%= node['datadog']['tags'] %>
<% if !node['datadog']['dogstreams'].empty? %>
dogstreams: <%= node['datadog']['dogstreams'].join(', ') %>
<% end %>
<% if node['datadog']['graphite'] %>
graphite_listen_port: <%= node['datadog']['graphite_port'] %>
Expand Down

0 comments on commit 59fc30f

Please sign in to comment.