Skip to content

Commit

Permalink
stable/datadog - Set DD_APM_ENABLED to false in container-agent.yaml …
Browse files Browse the repository at this point in the history
…template (helm#21510)

* enable deployment annotations, bump chart version (helm#21502)

Signed-off-by: Ryan Holt <ryan@ryanholt.net>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/datalog] Do not enable the `cri` check when running on a `docker` setup (helm#21476)

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/datadog] Add some missing syscalls to the `system-probe` seccomp profile (helm#21456)

The added syscalls are syscalls that an unconfined `system-probe` would do.

Signed-off-by: Lénaïc Huard <lenaic.huard@datadoghq.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/minio] corrected syntax error in statefulset (helm#21503)

* corrected syntax error in statefulset

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>

* chart version bump

Signed-off-by: Thomas Wilkinson <thomas.wilkinson@us.ibm.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* [stable/redis-ha] Make emptyDir configurable from values (helm#21489)

Signed-off-by: Jeroen Castelein <jeroencastelein11@gmail.com>
Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* Set DD_APM_ENABLED

With the new Helm chart, even if `datadog.apm.enabled` is set to false, it reverts to the docker defaults (true). 
Having the trace-agent running in the background is pretty harmless from a resource overhead standpoint, however, the logic of the helm chart will automatically do the 8126 port-forwarding, and since we don't want non-apm customers to have this port exposed, we need to respect the chart settings.

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* Bumped version

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* 2.0.12

Fixed a bug where datadog.apm.enabled was not being respected

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

* re-applying the changes

Signed-off-by: Omer Lifshitz <omer.lifshitz@datadoghq.com>

Co-authored-by: Ryan Holt <ryan@ryanholt.net>
Co-authored-by: Lénaïc Huard <L3n41c@users.noreply.github.com>
Co-authored-by: Thomas Wilkinson <thomas@capnajax.com>
Co-authored-by: Jeroen Castelein <jeroen.castelein@kpn.com>
  • Loading branch information
5 people authored and Ian Levesque committed Jul 13, 2020
1 parent 00b65c4 commit 2cba268
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
6 changes: 5 additions & 1 deletion stable/datadog/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## 2.0

## 2.0.14

* Fixed a bug where the `trace-agent` runs in the same container as `dd-agent`

## 2.0.13

* Fix `system-probe` startup on latest versions of containerd.
Expand All @@ -13,7 +17,7 @@
Message: failed to create containerd task: OCI runtime create failed: container_linux.go:349: starting container process caused "close exec fds: ensure /proc/self/fd is on procfs: operation not permitted": unknown
Exit Code: 128
```

## 2.0.11

* Add missing syscalls in the `system-probe` seccomp profile
Expand Down
2 changes: 1 addition & 1 deletion stable/datadog/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: datadog
version: 2.0.13
version: 2.0.14
appVersion: "7"
description: Datadog Agent
keywords:
Expand Down
2 changes: 2 additions & 0 deletions stable/datadog/templates/container-agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@
- name: DD_KUBERNETES_POD_ANNOTATIONS_AS_TAGS
value: '{{ toJson .Values.datadog.podAnnotationsAsTags }}'
{{- end }}
- name: DD_APM_ENABLED
value: "false"
- name: DD_LOGS_ENABLED
value: {{ (default false (or .Values.datadog.logs.enabled .Values.datadog.logsEnabled)) | quote}}
- name: DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL
Expand Down

0 comments on commit 2cba268

Please sign in to comment.