Skip to content
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

agent6 config: include statsd forward params #408

Merged
merged 1 commit into from
Jul 10, 2018
Merged

agent6 config: include statsd forward params #408

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
2 changes: 2 additions & 0 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,8 @@
'dogstatsd_port' => $dogstatsd_port,
'dogstatsd_socket' => $dogstatsd_socket,
'dogstatsd_non_local_traffic' => $non_local_traffic,
'statsd_forward_host' => $statsd_forward_host,
'statsd_forward_port' => $statsd_forward_port,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These parameters can actually be included in the $extra_config hash parameter available for additional options.

Copy link
Author

@djova djova Mar 9, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, and that's what we're doing now, but then isn't it misleading to have the corresponding parameters for the actual class be ignored with agent6? If the intention is to provide those parameters via extra_config then should the puppet class parameters be removed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's honor this, the deep_merge() should probably be seamless.

It's tough keeping an interface that was defined for agent5 with the new datadog.yaml approach in agent6. But this is a 1-to-1 mapping so no reason not to merge. Sorry we kept it in the backburner for so long.

Thanks.

'log_file' => $agent6_log_file,
'log_level' => $log_level,
'tags' => unique(flatten(union($_local_tags, $_facts_tags))),
Expand Down