diff --git a/README.md b/README.md index b12b082b..ed280ea8 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,8 @@ Role Variables - `datadog_api_key` - Your Datadog API key. - `datadog_checks` - YAML configuration for agent checks to drop into `/etc/dd-agent/conf.d`. -- `datadog_config` - Settings to place in `/etc/dd-agent/datadog.conf`. +- `datadog_config` - Settings to place in the `/etc/dd-agent/datadog.conf` INI file that go under the `[Main]` section. +- `datadog_config_ex` - Extra INI sections to go in `/etc/dd-agent/datadog.conf` (optional). - `datadog_process_checks` - Array of process checks and options (DEPRECATED: use `process` under `datadog_checks` instead) - `datadog_apt_repo` - Override default Datadog `apt` repository @@ -40,6 +41,12 @@ Example Playbooks datadog_config: tags: "mytag0, mytag1" log_level: INFO + apm_enabled: true + datadog_config_ex: + trace.config: + env: dev + trace.concentrator: + extra_aggregators: version datadog_checks: process: init_config: diff --git a/templates/datadog.conf.j2 b/templates/datadog.conf.j2 index 94c1554a..85dd700e 100644 --- a/templates/datadog.conf.j2 +++ b/templates/datadog.conf.j2 @@ -16,3 +16,10 @@ {% if datadog_config -%} {{ datadog_config | to_nice_yaml }} {% endif %} + +{% if datadog_config_ex is defined -%} +{% for section, keyvals in datadog_config_ex.iteritems() %} +[{{ section }}] +{{ keyvals | to_nice_yaml }} +{% endfor %} +{% endif %}