diff --git a/terraform/addons/logging-destination-firehose/.terraform.lock.hcl b/terraform/addons/logging-destination-firehose/.terraform.lock.hcl new file mode 100644 index 0000000000..3d971a357d --- /dev/null +++ b/terraform/addons/logging-destination-firehose/.terraform.lock.hcl @@ -0,0 +1,24 @@ +# This file is maintained automatically by "terraform init". +# Manual edits may be lost in future updates. + +provider "registry.terraform.io/hashicorp/aws" { + version = "5.44.0" + hashes = [ + "h1:QqMTKuyylmJ633mwNheXdFupfd5sozqCUTTSj89pnm8=", + "zh:1224a42bb04574785549b89815d98bda11f6e9992352fc6c36c5622f3aea91c0", + "zh:2a8d1095a2f1ab097f516d9e7e0d289337849eebb3fcc34f075070c65063f4fa", + "zh:46cce11150eb4934196d9bff693b72d0494c85917ceb3c2914d5ff4a785af861", + "zh:4a7c15d585ee747d17f4b3904851cd95cfbb920fa197aed3df78e8d7ef9609b6", + "zh:508f1a85a0b0f93bf26341207d809bd55b60c8fdeede40097d91f30111fc6f5d", + "zh:52f968ffc21240213110378d0ffb298cbd23e9157a6d01dfac5a4360492d69c2", + "zh:5e9846b48ef03eb59541049e81b15cae8bc7696a3779ae4a5412fdce60bb24e0", + "zh:850398aecaf7dc0231fc320fdd6dffe41836e07a54c8c7b40eb28e7525d3c0a9", + "zh:8f87eeb05bdd1b873b6cfb3898dfad6402ac180dfa3c8f9754df8f85dcf92ca6", + "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", + "zh:c726b87cd6ed111536f875dccedecff21abc802a4087264515ffab113cac36dc", + "zh:d57ea706d2f98b93c7b05b0c6bc3420de8e8cf2d0b6703085dc15ed239b2cc49", + "zh:d5d1a21246e68c2a7a04c5619eb0ad5a81644f644c432cb690537b816a156de2", + "zh:e869904cac41114b7e4ee66bcd2ce4585ed15ca842040a60cb47119f69472c91", + "zh:f1a09f2f3ea72cbe795b865cf31ad9b1866a536a8050cf0bb93d3fa51069582e", + ] +} diff --git a/terraform/addons/logging-destination-firehose/README.md b/terraform/addons/logging-destination-firehose/README.md index c7ce437a30..054cc69b3a 100644 --- a/terraform/addons/logging-destination-firehose/README.md +++ b/terraform/addons/logging-destination-firehose/README.md @@ -9,7 +9,7 @@ No requirements. | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.25.0 | +| [aws](#provider\_aws) | 5.44.0 | ## Modules @@ -46,6 +46,7 @@ No modules. | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| +| [compression\_format](#input\_compression\_format) | n/a | `string` | `"UNCOMPRESSED"` | no | | [osquery\_results\_s3\_bucket](#input\_osquery\_results\_s3\_bucket) | n/a |
object({
name = optional(string, "fleet-osquery-results-archive")
expires_days = optional(number, 1)
})
|
{
"expires_days": 1,
"name": "fleet-osquery-results-archive"
}
| no | | [osquery\_status\_s3\_bucket](#input\_osquery\_status\_s3\_bucket) | n/a |
object({
name = optional(string, "fleet-osquery-status-archive")
expires_days = optional(number, 1)
})
|
{
"expires_days": 1,
"name": "fleet-osquery-status-archive"
}
| no | diff --git a/terraform/addons/logging-destination-firehose/main.tf b/terraform/addons/logging-destination-firehose/main.tf index 8f8bd958e6..fcefd188de 100644 --- a/terraform/addons/logging-destination-firehose/main.tf +++ b/terraform/addons/logging-destination-firehose/main.tf @@ -151,8 +151,9 @@ resource "aws_kinesis_firehose_delivery_stream" "osquery_results" { destination = "extended_s3" extended_s3_configuration { - role_arn = aws_iam_role.firehose-results.arn - bucket_arn = aws_s3_bucket.osquery-results.arn + compression_format = var.compression_format + role_arn = aws_iam_role.firehose-results.arn + bucket_arn = aws_s3_bucket.osquery-results.arn } } @@ -161,8 +162,9 @@ resource "aws_kinesis_firehose_delivery_stream" "osquery_status" { destination = "extended_s3" extended_s3_configuration { - role_arn = aws_iam_role.firehose-status.arn - bucket_arn = aws_s3_bucket.osquery-status.arn + compression_format = var.compression_format + role_arn = aws_iam_role.firehose-status.arn + bucket_arn = aws_s3_bucket.osquery-status.arn } } diff --git a/terraform/addons/logging-destination-firehose/variables.tf b/terraform/addons/logging-destination-firehose/variables.tf index 3b3ca4524a..c97e2c36f6 100644 --- a/terraform/addons/logging-destination-firehose/variables.tf +++ b/terraform/addons/logging-destination-firehose/variables.tf @@ -19,3 +19,7 @@ variable "osquery_status_s3_bucket" { expires_days = 1 } } + +variable "compression_format" { + default = "UNCOMPRESSED" +}