diff --git a/charts/datadog/CHANGELOG.md b/charts/datadog/CHANGELOG.md index 85ab2c6bc..1d166f591 100644 --- a/charts/datadog/CHANGELOG.md +++ b/charts/datadog/CHANGELOG.md @@ -1,5 +1,9 @@ # Datadog changelog +## 3.66.1 + +* Add 'datadog.namespaceAnnotationsAsTags' to assign namespace annotations as tags on pod entities in the tagger. + ## 3.66.0 * Set default `Agent` and `Cluster-Agent` version to `7.54.0`. diff --git a/charts/datadog/Chart.yaml b/charts/datadog/Chart.yaml index 98a3246b4..f9e17263d 100644 --- a/charts/datadog/Chart.yaml +++ b/charts/datadog/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: datadog -version: 3.66.0 +version: 3.66.1 appVersion: "7" description: Datadog Agent keywords: diff --git a/charts/datadog/README.md b/charts/datadog/README.md index d5b3f817a..c2546a260 100644 --- a/charts/datadog/README.md +++ b/charts/datadog/README.md @@ -1,6 +1,6 @@ # Datadog -![Version: 3.66.0](https://img.shields.io/badge/Version-3.66.0-informational?style=flat-square) ![AppVersion: 7](https://img.shields.io/badge/AppVersion-7-informational?style=flat-square) +![Version: 3.66.1](https://img.shields.io/badge/Version-3.66.1-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/). @@ -748,6 +748,7 @@ helm install \ | datadog.logs.containerCollectAll | bool | `false` | Enable this to allow log collection for all containers | | datadog.logs.containerCollectUsingFiles | bool | `true` | Collect logs from files in /var/log/pods instead of using container runtime API | | datadog.logs.enabled | bool | `false` | Enables this to activate Datadog Agent log collection | +| datadog.namespaceAnnotationsAsTags | object | `{}` | Provide a mapping of Kubernetes Namespace Annotations to Datadog Tags | | datadog.namespaceLabelsAsTags | object | `{}` | Provide a mapping of Kubernetes Namespace Labels to Datadog Tags | | datadog.networkMonitoring.enabled | bool | `false` | Enable network performance monitoring | | datadog.networkPolicy.cilium.dnsSelector | object | kube-dns in namespace kube-system | Cilium selector of the DNS server entity | diff --git a/charts/datadog/templates/_components-common-env.yaml b/charts/datadog/templates/_components-common-env.yaml index 6d6394895..3ef5bb8f4 100644 --- a/charts/datadog/templates/_components-common-env.yaml +++ b/charts/datadog/templates/_components-common-env.yaml @@ -42,6 +42,10 @@ - name: DD_KUBERNETES_NAMESPACE_LABELS_AS_TAGS value: '{{ toJson .Values.datadog.namespaceLabelsAsTags }}' {{- end }} +{{- if .Values.datadog.namespaceAnnotationsAsTags }} +- name: DD_KUBERNETES_NAMESPACE_ANNOTATIONS_AS_TAGS + value: '{{ toJson .Values.datadog.namespaceAnnotationsAsTags }}' +{{- end }} - name: KUBERNETES value: "yes" {{- if .Values.datadog.site }} diff --git a/charts/datadog/values.yaml b/charts/datadog/values.yaml index 35c571ccf..7d1bed422 100644 --- a/charts/datadog/values.yaml +++ b/charts/datadog/values.yaml @@ -249,6 +249,11 @@ datadog: # env: environment # : + # datadog.namespaceAnnotationsAsTags -- Provide a mapping of Kubernetes Namespace Annotations to Datadog Tags + namespaceAnnotationsAsTags: {} + # env: environment + # : + originDetectionUnified: # datadog.originDetectionUnified.enabled -- Enabled enables unified mechanism for origin detection. Default: false. (Requires Agent 7.54.0+). enabled: false