Support process-agent configuration in datadog.yaml #511
Conversation
| # Example: 'image:redis,image:nginx' | ||
| default['datadog']['process_agent']['container_blacklist'] = nil | ||
| # Whitelist is applied after the blacklist. | ||
| default['datadog']['process_agent']['container_whitelist'] = nil |
There was a problem hiding this comment.
Blacklists for containers are handled in the standard Agent 6 way as we share the tagger code.
There was a problem hiding this comment.
We should also at some point clean up the config blacklist code in the process-agent since it looks like it's never used: https://github.com/DataDog/datadog-process-agent/blob/master/config/config.go#L65
attributes/default.rb
Outdated
|
|
||
| # If only collecting containers ('enable_process_agent' is false but docker is available) | ||
| # overrides the collection intervals for the full and real-time check. | ||
| default['datadog']['process_agent']['container_interval'] = nil | ||
| default['datadog']['process_agent']['rtcontainer_interval'] = nil |
There was a problem hiding this comment.
we're setting the defaults here explicitly so we don't have to worry about nil values in the config
There was a problem hiding this comment.
alternatively, you could remove the keys that have nil values in the template logic, with something like agent_config[:process_config].reject!{ |k,v| v.nil? }.
Having the defaults defined in the attributes instead of the agent has been a bit of a pain to work with in the past, hence the suggestion
conorbranagan
force-pushed
the
conor/process-agent
branch
from
4a2336a
to
b569a91
Compare
templates/default/datadog.yaml.erb
Outdated
| @@ -82,6 +93,20 @@ agent_config = @extra_config.merge({ | |||
|
|
|||
| # log agent options | |||
| log_enabled: node['datadog']['enable_logs_agent'] | |||
|
|
|||
| # process agent options | |||
| process_dd_url: node['datadog']['process_agent']['url'], | |||
There was a problem hiding this comment.
Note: raclette has put there endpoint within the apm_config section. Could we try to be consistent here? Would dd_url under process_config be better? I know this would imply changes to the process-agent, hopefully it's not too late.
There was a problem hiding this comment.
This is a good idea. I have a PR on the process-agent side in DataDog/datadog-process-agent#109 that will hopefully make it into the RC1. I'll update this with the assumption that it will get merged shortly.
templates/default/datadog.yaml.erb
Outdated
| @@ -82,6 +93,20 @@ agent_config = @extra_config.merge({ | |||
|
|
|||
| # log agent options | |||
| log_enabled: node['datadog']['enable_logs_agent'] | |||
|
|
|||
There was a problem hiding this comment.
we're missing a comma in the line above :)
conorbranagan
force-pushed
the
conor/process-agent
branch
from
b569a91
to
d474beb
Compare
There was a problem hiding this comment.
Looks good to me! I'll let @olivielpeau hit the green button! Thank you.
attributes/default.rb
Outdated
|
|
||
| # If only collecting containers ('enable_process_agent' is false but docker is available) | ||
| # overrides the collection intervals for the full and real-time check. | ||
| default['datadog']['process_agent']['container_interval'] = nil | ||
| default['datadog']['process_agent']['rtcontainer_interval'] = nil |
There was a problem hiding this comment.
alternatively, you could remove the keys that have nil values in the template logic, with something like agent_config[:process_config].reject!{ |k,v| v.nil? }.
Having the defaults defined in the attributes instead of the agent has been a bit of a pain to work with in the past, hence the suggestion
recipes/_agent6_config.rb
Outdated
| @@ -53,34 +52,6 @@ def conf_template_vars | |||
| notifies :restart, 'service[datadog-agent]', :delayed unless node['datadog']['agent_start'] == false | |||
| end | |||
|
|
|||
| template process_agent_config_file do | |||
There was a problem hiding this comment.
If this code worked for the beta A6 builds, could you keep it (along with the resource datadog_monitor 'process_agent') for now? I can take care of removing it when the Agent 6 is actually GA.
If we remove it now there's no "safe" path to upgrade from A6 beta.9 to rc.1 without breaking the process agent, as no version of this cookbook would fully support both.
I'd like the next version of the cookbook (2.14.0) to support both beta.9 and the RCs, and when we make A6 GA I'll release v3.0.0 of the cookbook with A6 installed by default, and all this legacy code removed.
Also remove process.conf for Agent 6
conorbranagan
force-pushed
the
conor/process-agent
branch
from
d474beb
to
54bb3d2
Compare
|
@olivielpeau Should be good now, thanks |
olivielpeau
dismissed
truthbk’s stale review
Jaime approved but github dismissed the approval (!?)
We can do this as of this change being merged: DataDog/datadog-agent#1136
The configuration format is defined in https://github.com/DataDog/datadog-process-agent/blob/master/config/yaml_config.go