disable datadog remote configuration/ tracing library envoy, enabled …

…by default since Agent version 7.47.0 (#106)
in4it · Jul 5, 2024 · 0588fdc · 0588fdc
1 parent eb539aa
commit 0588fdc
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 30 deletions.
diff --git a/terraform/envoy-proxy.tf b/terraform/envoy-proxy.tf
@@ -35,16 +35,17 @@ resource "aws_ecs_task_definition" "envoy-proxy" {
   network_mode             = "awsvpc"
   requires_compatibilities = ["FARGATE"]
   container_definitions    = templatefile("${path.module}/templates/envoy.json.tpl", {
-    mtls                  = var.mtls
-    AWS_REGION            = data.aws_region.current.name
-    ENVOY_RELEASE         = var.envoy_release
-    ENVOY_CONFIG          = aws_ssm_parameter.envoy-config-http.arn
-    APPMESH_NAME          = var.appmesh_name
-    APPMESH_ENVOY_RELEASE = var.appmesh_envoy_release
-    EXTRA_CONTAINERS      = var.extra_containers == "" ? "" : ",${var.extra_containers}"
-    EXTRA_DEPENDENCY      = var.extra_dependency == "" ? "" : var.enable_appmesh ? ",${var.extra_dependency}" : var.extra_dependency
-    ULIMIT_NOFILE_SOFT    = var.envoy_nofile_soft_limit
-    ULIMIT_NOFILE_HARD    = var.envoy_nofile_hard_limit
+    mtls                            = var.mtls
+    AWS_REGION                      = data.aws_region.current.name
+    ENVOY_RELEASE                   = var.envoy_release
+    ENVOY_CONFIG                    = aws_ssm_parameter.envoy-config-http.arn
+    APPMESH_NAME                    = var.appmesh_name
+    APPMESH_ENVOY_RELEASE           = var.appmesh_envoy_release
+    EXTRA_CONTAINERS                = var.extra_containers == "" ? "" : ",${var.extra_containers}"
+    EXTRA_DEPENDENCY                = var.extra_dependency == "" ? "" : var.enable_appmesh ? ",${var.extra_dependency}" : var.extra_dependency
+    ULIMIT_NOFILE_SOFT              = var.envoy_nofile_soft_limit
+    ULIMIT_NOFILE_HARD              = var.envoy_nofile_hard_limit
+    DD_REMOTE_CONFIGURATION_ENABLED = var.dd_remote_configuration_enabled
   })
 }
 
@@ -58,16 +59,17 @@ resource "aws_ecs_task_definition" "envoy-proxy-appmesh" {
   network_mode             = "awsvpc"
   requires_compatibilities = ["FARGATE"]
   container_definitions    = templatefile("${path.module}/templates/envoy-appmesh.json.tpl", {
-    mtls                  = var.mtls
-    AWS_REGION            = data.aws_region.current.name
-    ENVOY_RELEASE         = var.envoy_release
-    ENVOY_CONFIG          = aws_ssm_parameter.envoy-config-http.arn
-    APPMESH_NAME          = var.appmesh_name
-    APPMESH_ENVOY_RELEASE = var.appmesh_envoy_release
-    EXTRA_CONTAINERS      = var.extra_containers == "" ? "" : ",${var.extra_containers}"
-    EXTRA_DEPENDENCY      = var.extra_dependency == "" ? "" : var.enable_appmesh ? ",${var.extra_dependency}" : var.extra_dependency
-    ULIMIT_NOFILE_SOFT    = var.envoy_nofile_soft_limit
-    ULIMIT_NOFILE_HARD    = var.envoy_nofile_hard_limit
+    mtls                            = var.mtls
+    AWS_REGION                      = data.aws_region.current.name
+    ENVOY_RELEASE                   = var.envoy_release
+    ENVOY_CONFIG                    = aws_ssm_parameter.envoy-config-http.arn
+    APPMESH_NAME                    = var.appmesh_name
+    APPMESH_ENVOY_RELEASE           = var.appmesh_envoy_release
+    EXTRA_CONTAINERS                = var.extra_containers == "" ? "" : ",${var.extra_containers}"
+    EXTRA_DEPENDENCY                = var.extra_dependency == "" ? "" : var.enable_appmesh ? ",${var.extra_dependency}" : var.extra_dependency
+    ULIMIT_NOFILE_SOFT              = var.envoy_nofile_soft_limit
+    ULIMIT_NOFILE_HARD              = var.envoy_nofile_hard_limit
+    DD_REMOTE_CONFIGURATION_ENABLED = var.dd_remote_configuration_enabled
   })
 
   proxy_configuration {
@@ -140,16 +142,17 @@ resource "aws_ecs_task_definition" "envoy-proxy-https" {
   network_mode             = "awsvpc"
   requires_compatibilities = ["FARGATE"]
   container_definitions    = templatefile("${path.module}/templates/envoy.json.tpl", {
-    mtls                  = var.mtls
-    AWS_REGION            = data.aws_region.current.name
-    ENVOY_RELEASE         = var.envoy_release
-    ENVOY_CONFIG          = aws_ssm_parameter.envoy-config-http.arn
-    APPMESH_NAME          = var.appmesh_name
-    APPMESH_ENVOY_RELEASE = var.appmesh_envoy_release
-    EXTRA_CONTAINERS      = var.extra_containers == "" ? "" : ",${var.extra_containers}"
-    EXTRA_DEPENDENCY      = var.extra_dependency == "" ? "" : var.enable_appmesh ? ",${var.extra_dependency}" : var.extra_dependency
-    ULIMIT_NOFILE_SOFT    = var.envoy_nofile_soft_limit
-    ULIMIT_NOFILE_HARD    = var.envoy_nofile_hard_limit
+    mtls                            = var.mtls
+    AWS_REGION                      = data.aws_region.current.name
+    ENVOY_RELEASE                   = var.envoy_release
+    ENVOY_CONFIG                    = aws_ssm_parameter.envoy-config-http.arn
+    APPMESH_NAME                    = var.appmesh_name
+    APPMESH_ENVOY_RELEASE           = var.appmesh_envoy_release
+    EXTRA_CONTAINERS                = var.extra_containers == "" ? "" : ",${var.extra_containers}"
+    EXTRA_DEPENDENCY                = var.extra_dependency == "" ? "" : var.enable_appmesh ? ",${var.extra_dependency}" : var.extra_dependency
+    ULIMIT_NOFILE_SOFT              = var.envoy_nofile_soft_limit
+    ULIMIT_NOFILE_HARD              = var.envoy_nofile_hard_limit
+    DD_REMOTE_CONFIGURATION_ENABLED = var.dd_remote_configuration_enabled
   })
 }
 

diff --git a/terraform/templates/envoy.json.tpl b/terraform/templates/envoy.json.tpl
@@ -20,6 +20,12 @@
             "hardLimit": ${ULIMIT_NOFILE_HARD}
          }
        ],
+       "environment": [
+         {
+            "name": "DD_REMOTE_CONFIGURATION_ENABLED",
+            "value": "${DD_REMOTE_CONFIGURATION_ENABLED}"
+         }
+       ],
        "secrets": [
          { 
            "name": "ENVOY_CONFIG", 

diff --git a/terraform/variables.tf b/terraform/variables.tf
@@ -206,6 +206,10 @@ variable "enable_datadog" {
   description = "flag to enable datadog integration"
   default     = false
 }
+variable "dd_remote_configuration_enabled" {
+  description = "flag to enable/disable datadog remote configuration"
+  default     = true
+}
 variable "datadog_api_key" {
   description = "datadog api key"
   default     = ""