From 098790fad58497fe1eac588bdbbec4487293df9b Mon Sep 17 00:00:00 2001
From: Robert Fairburn <8029478+rfairburn@users.noreply.github.com>
Date: Fri, 10 May 2024 15:35:01 -0500
Subject: [PATCH] Update tf-mod-root version on terraform example (#18793)
---
terraform/example/.header.md | 11 +++++++----
terraform/example/README.md | 13 ++++++++-----
terraform/example/main.tf | 7 ++++++-
3 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/terraform/example/.header.md b/terraform/example/.header.md
index 4499883d97..58b24a6b7f 100644
--- a/terraform/example/.header.md
+++ b/terraform/example/.header.md
@@ -10,10 +10,13 @@ This code provides some example usage of the Fleet Terraform module, including h
Due to Terraform issues, this code requires 3 applies "from scratch":
1. `terraform apply -target module.fleet.module.vpc`
2. `terraform apply -target module.osquery-carve -target module.firehose-logging`
-3. If enabling mdm: `terraform apply -target module.mdm`. It will need to be uncommented as well as the KMS section below it.
-4. `terraform apply -target module.fleet`
-5. `terraform apply`
-6. If enabling mdm do the following:
+3. If using a new route53 zone:
+ - `terraform apply -target aws_route53_zone.main`
+ - From the output, obtain the NS records created for the zone and add them to the parent DNS zone
+4. If enabling mdm: `terraform apply -target module.mdm`. It will need to be uncommented as well as the KMS section below it.
+5. `terraform apply -target module.fleet`
+6. `terraform apply`
+7. If enabling mdm do the following:
- Record the KMS key from step 5 output.
- Use `fleetctl` to obtain all of the mdm certs. Use https://fleetdm.com/docs/using-fleet/mdm-macos-setup#apple-push-notification-service-apns and https://fleetdm.com/docs/using-fleet/mdm-macos-setup#apple-business-manager-abm for reference.
- Place the certificates in the `resources` folder with the following names based upon their function:
diff --git a/terraform/example/README.md b/terraform/example/README.md
index 8526e3d40e..17160c3055 100644
--- a/terraform/example/README.md
+++ b/terraform/example/README.md
@@ -10,10 +10,13 @@ This code provides some example usage of the Fleet Terraform module, including h
Due to Terraform issues, this code requires 3 applies "from scratch":
1. `terraform apply -target module.fleet.module.vpc`
2. `terraform apply -target module.osquery-carve -target module.firehose-logging`
-3. If enabling mdm: `terraform apply -target module.mdm`. It will need to be uncommented as well as the KMS section below it.
-4. `terraform apply -target module.fleet`
-5. `terraform apply`
-6. If enabling mdm do the following:
+3. If using a new route53 zone:
+ - `terraform apply -target aws_route53_zone.main`
+ - From the output, obtain the NS records created for the zone and add them to the parent DNS zone
+4. If enabling mdm: `terraform apply -target module.mdm`. It will need to be uncommented as well as the KMS section below it.
+5. `terraform apply -target module.fleet`
+6. `terraform apply`
+7. If enabling mdm do the following:
- Record the KMS key from step 5 output.
- Use `fleetctl` to obtain all of the mdm certs. Use https://fleetdm.com/docs/using-fleet/mdm-macos-setup#apple-push-notification-service-apns and https://fleetdm.com/docs/using-fleet/mdm-macos-setup#apple-business-manager-abm for reference.
- Place the certificates in the `resources` folder with the following names based upon their function:
@@ -56,7 +59,7 @@ This will encrypt all of the mdm secrets and add the .encrypted extension to the
|------|--------|---------|
| [acm](#module\_acm) | terraform-aws-modules/acm/aws | 4.3.1 |
| [firehose-logging](#module\_firehose-logging) | github.com/fleetdm/fleet//terraform/addons/logging-destination-firehose | tf-mod-addon-logging-destination-firehose-v1.1.0 |
-| [fleet](#module\_fleet) | github.com/fleetdm/fleet//terraform | tf-mod-root-v1.7.1 |
+| [fleet](#module\_fleet) | github.com/fleetdm/fleet//terraform | tf-mod-root-v1.7.3 |
| [migrations](#module\_migrations) | github.com/fleetdm/fleet//terraform/addons/migrations | tf-mod-addon-migrations-v2.0.0 |
| [osquery-carve](#module\_osquery-carve) | github.com/fleetdm/fleet//terraform/addons/osquery-carve | tf-mod-addon-osquery-carve-v1.0.1 |
diff --git a/terraform/example/main.tf b/terraform/example/main.tf
index 8265cff42d..9c051745f9 100644
--- a/terraform/example/main.tf
+++ b/terraform/example/main.tf
@@ -50,7 +50,7 @@ locals {
}
module "fleet" {
- source = "github.com/fleetdm/fleet//terraform?ref=tf-mod-root-v1.7.1"
+ source = "github.com/fleetdm/fleet//terraform?ref=tf-mod-root-v1.7.3"
certificate_arn = module.acm.acm_certificate_arn
vpc = {
@@ -82,6 +82,11 @@ module "fleet" {
rds_config = {
# See https://fleetdm.com/docs/deploy/reference-architectures#aws for instance classes.
instance_class = "db.t4g.medium"
+ # Prevents edge case render failure in Audit log on the home screen.
+ db_parameters = {
+ # 8mb up from 262144 (256k) default
+ sort_buffer_size = 8388608
+ }
}
redis_config = {
# See https://fleetdm.com/docs/deploy/reference-architectures#aws for instance types.