Skip to content

Commit

Permalink
[dogstatsd] dogstatsd should be on by default.
Browse files Browse the repository at this point in the history
[travis] ruby 1.9.3 has been EOL'd for a while, adding 2.2.3 and fixing CI.

[travis] newer rubies got issues with the puppet (official) gems.

[travis] fixing spec tests - default for dogstatsd is yes.

[travis] pinpoint rubocop to 0.35.x to address ruby 2.2.3 testing issues.

[travis] syck required?

[travis] excluding incompatible puppet modules with ruby 2.2.3.

[travis] moving changes to its own PR.
  • Loading branch information
truthbk committed Jun 22, 2016
1 parent 5823f78 commit 7ceb7b0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
# String. Default: empty
# $use_dogstatsd
# Enables the dogstatsd server
# Boolean. Default: false
# Boolean. Default: true
# $dogstatsd_port
# Specifies the port to be used by dogstatsd. Must have use_dogstatsd set
# String. Default: empty
Expand Down Expand Up @@ -216,7 +216,7 @@
$pup_port = '',
$pup_interface = '',
$pup_url = '',
$use_dogstatsd = false,
$use_dogstatsd = true,
$dogstatsd_target = '',
$dogstatsd_interval = '',
$dogstatsd_normalize = true,
Expand Down
8 changes: 4 additions & 4 deletions spec/classes/datadog_agent_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
'content' => /^# bind_host: localhost\n/,
)}
it { should contain_file('/etc/dd-agent/datadog.conf').with(
'content' => /^use_dogstatsd: no\n/,
'content' => /^use_dogstatsd: yes\n/,
)}
it { should contain_file('/etc/dd-agent/datadog.conf').with(
'content' => /^dogstatsd_port: 8125\n/,
Expand Down Expand Up @@ -341,10 +341,10 @@
)}
end

context 'with use_dogstatsd set to yes' do
let(:params) {{:use_dogstatsd => true}}
context 'with use_dogstatsd set to no' do
let(:params) {{:use_dogstatsd => false}}
it { should contain_file('/etc/dd-agent/datadog.conf').with(
'content' => /^use_dogstatsd: yes\n/,
'content' => /^use_dogstatsd: no\n/,
)}
end
context 'with dogstatsd_port set to 8126' do
Expand Down

0 comments on commit 7ceb7b0

Please sign in to comment.