Skip to content

Commit

Permalink
Merge pull request #45 from kcampos/feat-disable_syslog
Browse files Browse the repository at this point in the history
Expose log_to_syslog config option
  • Loading branch information
LeoCavaille committed Sep 30, 2014
2 parents d4e2f8d + e9ba162 commit e5f7e73
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions manifests/init.pp
Expand Up @@ -25,6 +25,9 @@
# $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.
# $log_to_syslog
# Set value of 'log_to_syslog' variable. Default is true -> yes as in dd-agent.
# Valid values here are: true or false.
#
# Actions:
#
Expand Down Expand Up @@ -54,6 +57,7 @@
$puppetmaster_user = 'puppet',
$non_local_traffic = false,
$log_level = 'info',
$log_to_syslog = true,
$service_ensure = 'running',
$service_enable = true
) inherits datadog_agent::params {
Expand All @@ -66,6 +70,7 @@
validate_bool($puppet_run_reports)
validate_string($puppetmaster_user)
validate_bool($non_local_traffic)
validate_bool($log_to_syslog)
validate_string($log_level)

include datadog_agent::params
Expand Down
2 changes: 1 addition & 1 deletion templates/datadog.conf.erb
Expand Up @@ -215,6 +215,6 @@ log_level: <%= @_loglevel %>
# if syslog is enabled but a host and port are not set, a local domain socket
# connection will be attempted
#
# log_to_syslog: yes
log_to_syslog: <%= @log_to_syslog ? "yes" : "no" %>
# syslog_host:
# syslog_port:

0 comments on commit e5f7e73

Please sign in to comment.