added option for datadog logging, upgrade to work with terraform ~15

main.tf

@@ -6,6 +6,7 @@ locals {
     "cookielab.io/application" = "metrics-server",
     "cookielab.io/process" = "bootstrap"
   }
+
   daemonset_labels = merge(
     {
       "cookielab.io/terraform-module" = "datadog",
@@ -139,7 +140,7 @@ resource "kubernetes_daemonset" "datadog_agent" {
     template {
       metadata {
         name = "datadog-agent"
-        labels = local.daemonset_selector_labels
+        labels = local.daemonset_labels
       }
 
       spec {
@@ -207,6 +208,21 @@ resource "kubernetes_daemonset" "datadog_agent" {
             name = "DD_APM_ENABLED"
             value = var.datadog_agent_options_apm_enabled
           }
+          env {
+            name = "DD_LOGS_ENABLED"
+            value = var.datadog_agent_options_logs_enabled
+          }
+
+          env {
+            name = "DD_CLUSTER_NAME"
+            value = var.kubernetes_cluster_name
+          }
+
+          env {
+            name = "DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL"
+            value = var.datadog_agent_options_logs_enabled
+          }
+
 
           env {
             name = "DD_KUBERNETES_KUBELET_HOST"
@@ -217,18 +233,27 @@ resource "kubernetes_daemonset" "datadog_agent" {
             }
           }
 
+          env {
+            name = "DD_ENV"
+            value_from {
+              field_ref {
+                field_path = "metadata.labels['tags.datadoghq.com/env']"
+              }
+            }
+          }
+
           env {
             name = "DD_KUBELET_TLS_VERIFY"
             value = var.datadog_agent_options_kubelet_tls_verify
           }
 
           resources {
-            requests {
+            requests = {
               memory = "256Mi"
               cpu = "200m"
             }
 
-            limits {
+            limits = {
               memory = "256Mi"
               cpu = "200m"
             }

resources/datadog-agent.yaml

@@ -83,6 +83,7 @@ spec:
           - {name: cgroups, mountPath: /host/sys/fs/cgroup, readOnly: true}
           - {name: s6-run, mountPath: /var/run/s6}
           - {name: logpodpath, mountPath: /var/log/pods}
+          - {name: pointerdir, mountPath: /opt/datadog-agent/run}
           ## Docker runtime directory, replace this path with your container runtime
           ## logs directory, or remove this configuration if `/var/log/pods`
           ## is not a symlink to any other directory.
@@ -102,6 +103,7 @@ spec:
         - {name: cgroups, hostPath: {path: /sys/fs/cgroup}}
         - {name: s6-run, emptyDir: {}}
         - {name: logpodpath, hostPath: {path: /var/log/pods}}
+        - {name: pointerdir, hostPath: {path: /opt/datadog-agent/run}}
         ## Docker runtime directory, replace this path with your container runtime
         ## logs directory, or remove this configuration if `/var/log/pods`
         ## is not a symlink to any other directory.

variables.tf

@@ -63,6 +63,19 @@ variable "datadog_agent_options_apm_enabled" {
   description = "Enable APM logging?"
 }
 
+variable "datadog_agent_options_logs_enabled" {
+  type = bool
+  default = true
+  description = "Enable datadog logs?"
+}
+
+variable "kubernetes_cluster_name" {
+  type = string
+  default = ""
+  description = "kubernetes cluster name"
+
+}
+
 variable "datadog_agent_options_collect_kubernetes_events" {
   type = bool
   default = true