Skip to content

feat: add ability to disable configSync #2169

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

Open
tr3mor wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: add ability to disable configSync #2169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions charts/datadog/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Datadog changelog

## 3.146.0

* Add ability to disable configSync between otel-agent and agent container via `datadog.otelCollector.enableConfigSync`. Default is true to match previous behaviour.

## 3.145.1

* [CONS-7793] Add necessary RBAC for ArgoRollout to be provide read access to the admission controller.
Expand Down
2 changes: 1 addition & 1 deletion charts/datadog/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: v1
name: datadog
version: 3.145.1
version: 3.146.0
appVersion: "7"
description: Datadog Agent
keywords:
Expand Down
3 changes: 2 additions & 1 deletion charts/datadog/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Datadog

![Version: 3.145.1](https://img.shields.io/badge/Version-3.145.1-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)
![Version: 3.146.0](https://img.shields.io/badge/Version-3.146.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square)

[Datadog](https://www.datadoghq.com/) is a hosted infrastructure monitoring platform. This chart adds the Datadog Agent to all nodes in your cluster via a DaemonSet. It also optionally depends on the [kube-state-metrics chart](https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-state-metrics). For more information about monitoring Kubernetes with Datadog, please refer to the [Datadog documentation website](https://docs.datadoghq.com/agent/basic_agent_usage/kubernetes/).

Expand Down Expand Up @@ -855,6 +855,7 @@ helm install <RELEASE_NAME> \
| datadog.otelCollector.configMap.items | string | `nil` | Items within the ConfigMap that contain DDOT Collector configuration |
| datadog.otelCollector.configMap.key | string | `"otel-config.yaml"` | Key within the ConfigMap that contains the DDOT Collector configuration |
| datadog.otelCollector.configMap.name | string | `nil` | Name of the existing ConfigMap that contains the DDOT Collector configuration |
| datadog.otelCollector.enableConfigSync | bool | `true` | |
| datadog.otelCollector.enabled | bool | `false` | Enable the OTel Collector |
| datadog.otelCollector.featureGates | string | `nil` | Feature gates to pass to OTel collector, as a comma separated list |
| datadog.otelCollector.logs.enabled | bool | `false` | Enable logs support in the OTel Collector. If true, checks OTel Collector config for filelog receiver and mounts additional volumes to collect containers and pods logs. |
Expand Down
12 changes: 12 additions & 0 deletions charts/datadog/ci/agent-otel-collector-disable-configsync.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
targetSystem: "linux"
agents:
image:
tagSuffix: full
datadog:
apiKey: "f0000000000000000000000000000000"
appKey: "f000000000000000000000000000000000000000"
kubelet:
tlsVerify: false
otelCollector:
enabled: true
enableConfigSync: false
5 changes: 5 additions & 0 deletions charts/datadog/templates/_container-otel-agent.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,13 @@
env:
{{- include "containers-common-env" . | nindent 4 }}
{{- include "containers-cluster-agent-env" . | nindent 4 }}
{{- if .Values.datadog.otelCollector.enableConfigSync }}
- name: DD_AGENT_IPC_PORT
value: "5009"
{{- else }}
- name: DD_AGENT_IPC_PORT
value: "0"
{{- end }}
- name: DD_AGENT_IPC_CONFIG_REFRESH_INTERVAL
value: "60"
{{- if .Values.datadog.otelCollector.enabled }}
Expand Down
3 changes: 3 additions & 0 deletions charts/datadog/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,9 @@ datadog:
# If true, checks OTel Collector config for filelog receiver and mounts additional volumes to collect containers
# and pods logs.
enabled: false
# datadog.otelCollector.enableConfigSync controls configSync mechanism
# between otel-agent container and agent container.
enableConfigSync: true

## Continuous Profiler configuration
##
Expand Down