From aa2a0807112bff397b1a7cfce7c09c16ef2605fd Mon Sep 17 00:00:00 2001 From: Jorge Falcon <22119513+BCTBB@users.noreply.github.com> Date: Wed, 9 Jul 2025 12:43:08 -0400 Subject: [PATCH] Dogfood - re-enabling webhook log destination (#30690) - Disabling firehose log destination - Re-enabling webhook log destination ## Summary by CodeRabbit * **New Features** * Enabled webhook logging by activating environment variables for webhook URLs. * Webhook log plugin is now conditionally set based on the presence of a webhook URL. * **Chores** * Updated environment variable management by removing firehose-logging addon variables from the configuration. --- infrastructure/dogfood/terraform/aws-tf-module/main.tf | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/infrastructure/dogfood/terraform/aws-tf-module/main.tf b/infrastructure/dogfood/terraform/aws-tf-module/main.tf index 02c99e2ea7..63e60c6c50 100644 --- a/infrastructure/dogfood/terraform/aws-tf-module/main.tf +++ b/infrastructure/dogfood/terraform/aws-tf-module/main.tf @@ -71,9 +71,9 @@ locals { FLEET_DEV_ANDROID_ENABLED = "1" FLEET_DEV_ANDROID_SERVICE_CREDENTIALS = var.android_service_credentials # Webhook Results & Status Logging Destination - # FLEET_WEBHOOK_STATUS_URL = var.webhook_url - # FLEET_WEBHOOK_RESULT_URL = var.webhook_url - # FLEET_OSQUERY_RESULT_LOG_PLUGIN = var.webhook_url != "" ? "webhook" : "" + FLEET_WEBHOOK_STATUS_URL = var.webhook_url + FLEET_WEBHOOK_RESULT_URL = var.webhook_url + FLEET_OSQUERY_RESULT_LOG_PLUGIN = var.webhook_url != "" ? "webhook" : "" } sentry_secrets = { FLEET_SENTRY_DSN = "${aws_secretsmanager_secret.sentry.arn}:FLEET_SENTRY_DSN::" @@ -142,7 +142,6 @@ module "main" { } extra_iam_policies = concat(module.firehose-logging.fleet_extra_iam_policies, module.osquery-carve.fleet_extra_iam_policies, module.ses.fleet_extra_iam_policies) extra_environment_variables = merge( - module.firehose-logging.fleet_extra_environment_variables, module.osquery-carve.fleet_extra_environment_variables, module.ses.fleet_extra_environment_variables, local.extra_environment_variables,