Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #98 from DataDog/talwai/rebased_add_dogstreams

Add dogstreams array to manifest
  • Loading branch information...
commit 85e5524b548946e14cc93f38192ad921728ee9e8 2 parents 395ab74 + 9c8db12
@talwai talwai authored
Showing with 10 additions and 0 deletions.
  1. +5 −0 manifests/init.pp
  2. +5 −0 templates/datadog.conf.erb
View
5 manifests/init.pp
@@ -26,6 +26,9 @@
# $non_local_traffic
# Enable you to use the agent as a proxy. Defaults to false.
# See https://github.com/DataDog/dd-agent/wiki/Proxy-Configuration
+# $dogstreams
+# Optional array of logs to parse and custom parsers to use.
+# See https://github.com/DataDog/dd-agent/blob/ed5e698/datadog.conf.example#L149-L178
# $log_level
# Set value of 'log_level' variable. Default is 'info' as in dd-agent.
# Valid values here are: critical, debug, error, fatal, info, warn and warning.
@@ -74,6 +77,7 @@
$puppet_run_reports = false,
$puppetmaster_user = 'puppet',
$non_local_traffic = false,
+ $dogstreams = [],
$log_level = 'info',
$log_to_syslog = true,
$service_ensure = 'running',
@@ -90,6 +94,7 @@
validate_string($host)
validate_string($api_key)
validate_array($tags)
+ validate_array($dogstreams)
validate_array($facts_to_tags)
validate_bool($puppet_run_reports)
validate_string($puppetmaster_user)
View
5 templates/datadog.conf.erb
@@ -206,6 +206,11 @@ non_local_traffic: <%= @non_local_traffic %>
# If this value isn't specified, the default parser assumes this log format:
# metric timestamp value key0=val0 key1=val1 ...
#
+<%
+if not @dogstreams.empty?
+-%>
+dogstreams: <%= dogstreams.join(', ') %>
+<% end -%>
# ========================================================================== #
# Custom Emitters #
Please sign in to comment.
Something went wrong with that request. Please try again.