Skip to content

NRL 1468 update reporting s3 lifecycle #906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jackleary merged 2 commits into from
May 20, 2025
Merged

NRL 1468 update reporting s3 lifecycle #906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f025f39
NRL-1486 Reduce initial storage to 2 days and infrequent access to 7
jackleary May 19, 2025
e69b469
NRL-1486 Expire logs after 1 day. Up firehose filesize to further low…
jackleary May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions terraform/account-wide-infrastructure/modules/glue/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
locals {
s3 = {
transition_storage = {
infrequent_access = {
storage_class = "STANDARD_IA"
days = 150
}
glacier = {
storage_class = "GLACIER"
days = 200
}
}

expiration = {
days = 1095
days = 1
}
}
}
8 changes: 0 additions & 8 deletions terraform/account-wide-infrastructure/modules/glue/s3.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,6 @@ resource "aws_s3_bucket_lifecycle_configuration" "source-data-bucket-lifecycle"
id = "bucket-versioning-rule"
status = "Enabled"

transition {
days = local.s3.transition_storage.infrequent_access.days
storage_class = local.s3.transition_storage.infrequent_access.storage_class
}
transition {
days = local.s3.transition_storage.glacier.days
storage_class = local.s3.transition_storage.glacier.storage_class
}
expiration {
days = local.s3.expiration.days
}
Expand Down
6 changes: 4 additions & 2 deletions terraform/infrastructure/modules/firehose/kinesis.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ resource "aws_kinesis_firehose_delivery_stream" "reporting_stream" {
destination = "extended_s3"

extended_s3_configuration {
role_arn = aws_iam_role.firehose.arn
bucket_arn = var.reporting_bucket_arn
role_arn = aws_iam_role.firehose.arn
bucket_arn = var.reporting_bucket_arn
buffering_size = 64
buffering_interval = 600

processing_configuration {
enabled = "true"
Expand Down
Loading