Merge pull request #15 from lagerfeuer/master

Add Datadog Process collection for ECS
robertomoutinho · Dec 29, 2023 · 0f5054e · 0f5054e
2 parents f0c0ac7 + 61a79e7
commit 0f5054e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -121,6 +121,7 @@ This repository contains Terraform infrastructure code which creates AWS resourc
 | <a name="input_datadog_agent_container_image"></a> [datadog\_agent\_container\_image](#input\_datadog\_agent\_container\_image) | The datadog agent sidecar container image | `string` | `"datadog/agent:latest"` | no |
 | <a name="input_datadog_firelens_container_essential"></a> [datadog\_firelens\_container\_essential](#input\_datadog\_firelens\_container\_essential) | Determines whether all other containers in a task are stopped, if this container fails or stops for any reason | `bool` | `false` | no |
 | <a name="input_datadog_firelens_container_image"></a> [datadog\_firelens\_container\_image](#input\_datadog\_firelens\_container\_image) | The datadog firelens sidecar container image | `string` | `"amazon/aws-for-fluent-bit:stable"` | no |
+| <a name="input_datadog_process_collection_enabled"></a> [datadog\_process\_collection\_enabled](#input\_datadog\_process\_collection\_enabled) | Whether to enable process collection | `bool` | `true` | no |
 | <a name="input_datadog_service_name"></a> [datadog\_service\_name](#input\_datadog\_service\_name) | The datadog service name | `string` | `""` | no |
 | <a name="input_datadog_tags"></a> [datadog\_tags](#input\_datadog\_tags) | Tags for datadog agent container. | `string` | `"env:default, service:default, region:default"` | no |
 | <a name="input_docker_labels"></a> [docker\_labels](#input\_docker\_labels) | Docker labels to add to the container | `map(string)` | `{}` | no |

diff --git a/dd-agent.tf b/dd-agent.tf
@@ -52,6 +52,10 @@ module "datadog_sidecar" {
       name  = "DD_TAGS"
       value = replace(var.datadog_tags, ",", " ")
     },
+    {
+      name  = "DD_PROCESS_AGENT_PROCESS_COLLECTION_ENABLED"
+      value = tostring(var.datadog_process_collection_enabled)
+    }
   ]
 
   secrets = [

diff --git a/ecs.tf b/ecs.tf
@@ -206,5 +206,8 @@ resource "aws_ecs_task_definition" "app" {
       }
     }
   }
+
+  pid_mode = var.datadog_process_collection_enabled ? "task" : null
+
   tags = local.local_tags
 }
diff --git a/variables.tf b/variables.tf
@@ -568,6 +568,12 @@ variable "datadog_service_name" {
   default     = ""
 }
 
+variable "datadog_process_collection_enabled" {
+  description = "Whether to enable process collection"
+  type        = bool
+  default     = true
+}
+
 variable "datadog_tags" {
   description = " Tags for datadog agent container."
   type        = string
-Original file line number
+Diff line change
@@ Expand Up / @@ -206,5 +206,8 @@ resource "aws_ecs_task_definition" "app" { @@
           }
         }
       }
+      pid_mode = var.datadog_process_collection_enabled ? "task" : null
       tags = local.local_tags
     }