Skip to content

NRL 1288/1304 Reporting allow multiple log groups #840

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 8 commits into from
Feb 17, 2025
Merged

NRL 1288/1304 Reporting allow multiple log groups #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
52bb75d
NRL-1288 framework for multiple schema submission
jackleary Feb 14, 2025
d65768f
NRL-1288 naming conventions and path updates
jackleary Feb 14, 2025
cc64d6d
NRL-1288 add schemas in for multiple log groups
jackleary Feb 17, 2025
3411870
NRL-1288 import pathing
jackleary Feb 17, 2025
530aef8
NRL-1288 syntax six
jackleary Feb 17, 2025
53839cc
NRL-1288 syntax six
jackleary Feb 17, 2025
7c66994
NRL-1288 update athena data sources
jackleary Feb 17, 2025
589a5ae
NRL-1288 update schemas
jackleary Feb 17, 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
38 changes: 34 additions & 4 deletions terraform/account-wide-infrastructure/modules/glue/glue.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Create Glue Data Catalog Database
resource "aws_glue_catalog_database" "log_database" {
name = "${var.name_prefix}-reporting"
location_uri = "${aws_s3_bucket.target-data-bucket.id}/logs/"
location_uri = "${aws_s3_bucket.target-data-bucket.id}/"
}

# Create Glue Crawler
Expand All @@ -10,7 +10,37 @@ resource "aws_glue_crawler" "log_crawler" {
database_name = aws_glue_catalog_database.log_database.name
role = aws_iam_role.glue_service_role.name
s3_target {
path = "${aws_s3_bucket.target-data-bucket.id}/logs/"
path = "${aws_s3_bucket.target-data-bucket.id}/consumer_countDocumentReference/"
}
s3_target {
path = "${aws_s3_bucket.target-data-bucket.id}/consumer_readDocumentReference/"
}
s3_target {
path = "${aws_s3_bucket.target-data-bucket.id}/consumer_searchDocumentReference/"
}
s3_target {
path = "${aws_s3_bucket.target-data-bucket.id}/consumer_searchPostDocumentReference/"
}
s3_target {
path = "${aws_s3_bucket.target-data-bucket.id}/producer_createDocumentReference/"
}
s3_target {
path = "${aws_s3_bucket.target-data-bucket.id}/producer_deleteDocumentReference/"
}
s3_target {
path = "${aws_s3_bucket.target-data-bucket.id}/producer_readDocumentReference/"
}
s3_target {
path = "${aws_s3_bucket.target-data-bucket.id}/producer_searchDocumentReference/"
}
s3_target {
path = "${aws_s3_bucket.target-data-bucket.id}/producer_searchPostDocumentReference/"
}
s3_target {
path = "${aws_s3_bucket.target-data-bucket.id}/producer_updateDocumentReference/"
}
s3_target {
path = "${aws_s3_bucket.target-data-bucket.id}/producer_upsertDocumentReference//"
}
schema_change_policy {
delete_behavior = "LOG"
Expand Down Expand Up @@ -49,8 +79,8 @@ resource "aws_glue_job" "glue_job" {
"--enable-auto-scaling" = "true"
"--enable-continous-cloudwatch-log" = "true"
"--datalake-formats" = "delta"
"--source_path" = "s3://${aws_s3_bucket.source-data-bucket.id}/" # Specify the source S3 path
"--target_path" = "s3://${aws_s3_bucket.target-data-bucket.id}/logs" # Specify the destination S3 path
"--source_path" = "s3://${aws_s3_bucket.source-data-bucket.id}/" # Specify the source S3 path
"--target_path" = "s3://${aws_s3_bucket.target-data-bucket.id}/" # Specify the destination S3 path
"--job_name" = "${var.name_prefix}-glue-job"
"--partition_cols" = "date"
"--enable-continuous-log-filter" = "true"
Expand Down
Loading
Loading