From 3fc78e0e3cfab0dce475870124b482924d2b257a Mon Sep 17 00:00:00 2001 From: Benjamin Edwards Date: Mon, 1 May 2023 17:38:18 -0400 Subject: [PATCH] firehose module update (#11444) --- .../firehose/outputs.tf | 3 +-- .../firehose/variables.tf | 11 ++++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/terraform/addons/byo-firehose-logging-destination/firehose/outputs.tf b/terraform/addons/byo-firehose-logging-destination/firehose/outputs.tf index 37d781cb86..6dc7b127b6 100644 --- a/terraform/addons/byo-firehose-logging-destination/firehose/outputs.tf +++ b/terraform/addons/byo-firehose-logging-destination/firehose/outputs.tf @@ -1,10 +1,9 @@ -data "aws_region" "current" {} output "fleet_extra_environment_variables" { value = { FLEET_FIREHOSE_STATUS_STREAM = var.firehose_status_name FLEET_FIREHOSE_RESULT_STREAM = var.firehose_results_name FLEET_FIREHOSE_STS_ASSUME_ROLE_ARN = var.iam_role_arn - FLEET_FIREHOSE_REGION = data.aws_region.current.name + FLEET_FIREHOSE_REGION = var.region FLEET_OSQUERY_STATUS_LOG_PLUGIN = "firehose" FLEET_OSQUERY_RESULT_LOG_PLUGIN = "firehose" } diff --git a/terraform/addons/byo-firehose-logging-destination/firehose/variables.tf b/terraform/addons/byo-firehose-logging-destination/firehose/variables.tf index 21fb3375f2..4927b04600 100644 --- a/terraform/addons/byo-firehose-logging-destination/firehose/variables.tf +++ b/terraform/addons/byo-firehose-logging-destination/firehose/variables.tf @@ -1,14 +1,19 @@ variable "iam_role_arn" { - type = string + type = string description = "IAM Role ARN to use for Firehose destination logging" } variable "firehose_results_name" { - type = string + type = string description = "name of the firehose delivery stream for osquery results logs" } variable "firehose_status_name" { - type = string + type = string description = "name of the firehose delivery stream for osquery status logs" } + +variable "region" { + type = string + description = "region the target firehose delivery stream is in" +}