Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ To configure a custom check use the configuration below. This creates the corres

##### Custom Python Checks

To pass a Python check to the playbook, use the configuration below.
To pass a Python check to the playbook, use the configuration below.

This configuration requires the Datadog [play and role][12] to be a part of the larger playbook where the value passed in is the relative file path to the actual task for [Linux][13] or [Windows][14].

This is only available for Agent v6+.
This is only available for Agent v6 or later.

The key should be the name of the file created in the checks directory `checks.d/{{ item }}.py`:

Expand Down Expand Up @@ -200,6 +200,8 @@ The system probe is configured under the `system_probe_config` variable. Any var

[Universal Service Monitoring][17] (USM) is configured under the `service_monitoring_config` variable. Any variables nested underneath are written to the `system-probe.yaml`, in the `service_monitoring_config` section.

[Compliance][18] is configured under the `compliance_config` variable. Any variables nested underneath are written to the `security-agent.yaml`, in the `compliance_config` section.

**Note for Windows users**: NPM is supported on Windows with Agent v6.27+ and v7.27+. It ships as an optional component that is only installed if `network_config.enabled` is set to true when the Agent is installed or upgraded. Because of this, existing installations might need to do an uninstall and reinstall of the Agent once to install the NPM component, unless the Agent is upgraded at the same time.

#### Example configuration
Expand Down Expand Up @@ -639,4 +641,5 @@ To fix this, [update Ansible to `v2.9.8` or above][16].
[14]: https://github.com/DataDog/ansible-datadog/blob/main/tasks/agent-win.yml
[15]: https://www.datadoghq.com/blog/datadog-marketplace/
[16]: https://github.com/ansible/ansible/blob/stable-2.9/changelogs/CHANGELOG-v2.9.rst#id61
[17]: https://docs.datadoghq.com/tracing/universal_service_monitoring/?tab=configurationfiles#enabling-universal-service-monitoring
[17]: https://docs.datadoghq.com/tracing/universal_service_monitoring/?tab=configurationfiles#enabling-universal-service-monitoring
[18]: https://docs.datadoghq.com/security/cspm/setup/?tab=docker
10 changes: 10 additions & 0 deletions templates/security-agent.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,13 @@ runtime_security_config:
{{ runtime_security_config | to_nice_yaml }}
{% endfilter %}
{% endif %}
{% if compliance_config is defined and compliance_config | default({}, true) | length > 0 -%}
compliance_config:
{# The "first" option in indent() is only supported by jinja 2.10+
while the old equivalent option "indentfirst" is removed in jinja 3.
Using non-keyword argument in indent() to be backward compatible.
#}
{% filter indent(2, True) %}
{{ compliance_config | to_nice_yaml }}
{% endfilter %}
{% endif %}