Skip to content

[agent6] fix hostname override tag support #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
truthbk merged 1 commit into from
Jul 10, 2018
Merged

[agent6] fix hostname override tag support #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,7 @@
$_agent_config = {
'api_key' => $api_key,
'dd_url' => $dd_url,
'hostname' => $host,
'cmd_port' => 5001,
'conf_path' => $datadog_agent::params::conf6_dir,
'enable_metadata_collection' => $collect_instance_metadata,
Expand Down
13 changes: 12 additions & 1 deletion spec/classes/datadog_agent_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,18 @@
end
end

context 'with apm_extra_config' do
context 'with modified defaults' do
context 'hostname override' do
let(:params) {{
:host => 'my_custom_hostname',
}}
it { should contain_file('/etc/datadog-agent/datadog.yaml').with(
'content' => /^hostname: my_custom_hostname\n/,
)}
end
end

context 'with additional agents config' do
context 'with extra_options and APM enabled' do
let(:params) {{
:apm_enabled => true,
Expand Down
⚡