Merge branch 'main' into 22115-script-automation-be

fleetdm · Oct 3, 2024 · 2dd9eda · 2dd9eda
2 parents 990d57c + 54f209d
commit 2dd9eda
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/infrastructure/dogfood/terraform/aws-tf-module/free.tf b/infrastructure/dogfood/terraform/aws-tf-module/free.tf
@@ -88,7 +88,7 @@ module "free" {
       prefix  = local.customer_free
       enabled = true
     }
-    idle_timeout = 300
+    idle_timeout = 605
   }
 }
 

diff --git a/infrastructure/dogfood/terraform/aws-tf-module/main.tf b/infrastructure/dogfood/terraform/aws-tf-module/main.tf
@@ -214,7 +214,7 @@ module "main" {
       prefix  = local.customer
       enabled = true
     }
-    idle_timeout = 300
+    idle_timeout = 605
     #    extra_target_groups = [
     #      {
     #        name             = module.saml_auth_proxy.name

diff --git a/infrastructure/dogfood/terraform/aws/ecs.tf b/infrastructure/dogfood/terraform/aws/ecs.tf
@@ -16,7 +16,7 @@ resource "aws_alb" "main" {
   internal                   = false #tfsec:ignore:aws-elb-alb-not-public
   security_groups            = [aws_security_group.lb.id, aws_security_group.backend.id]
   subnets                    = module.vpc.public_subnets
-  idle_timeout               = 120
+  idle_timeout               = 605
   name                       = "fleetdm"
   drop_invalid_header_fields = true
 }

diff --git a/infrastructure/dogfood/terraform/aws/percona/percona.tf b/infrastructure/dogfood/terraform/aws/percona/percona.tf
@@ -27,7 +27,7 @@ resource "aws_lb" "main" {
   internal                   = false #tfsec:ignore:aws-elb-alb-not-public
   security_groups            = [aws_security_group.lb.id, aws_security_group.backend.id]
   subnets                    = var.public_subnets
-  idle_timeout               = 120
+  idle_timeout               = 605
   drop_invalid_header_fields = true
 }
 
@@ -134,4 +134,4 @@ EOF
 resource "aws_iam_role_policy_attachment" "test-attach" {
   role       = aws_iam_role.role.name
   policy_arn = aws_iam_policy.policy.arn
-}
+}
diff --git a/terraform/example/main.tf b/terraform/example/main.tf
@@ -108,7 +108,7 @@ module "fleet" {
   alb_config = {
     # Script execution can run for up to 300s plus overhead.
     # Ensure the load balancer does not 5XX before we have results.
-    idle_timeout = 305
+    idle_timeout = 605
   }
 }