Skip to content

add support for configuring trace agent #45

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
talwai merged 5 commits into from
Mar 3, 2017
Merged

add support for configuring trace agent #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a74da29
add support for configuring trace agent
pmbauer Feb 9, 2017
cd4e56f
typos and clarifications for datadog_config_ex
pmbauer Feb 10, 2017
ececa4c
add missing apm_enabled example in README
pmbauer Feb 15, 2017
9ab8948
name refactor for datadog_config_ex
pmbauer Feb 15, 2017
44ea81d
fix: whitespace
pmbauer Mar 1, 2017
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
9 changes: 8 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions templates/datadog.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}