Restructure and variablize config
This commit is contained in:
parent
419bb286d4
commit
c6eed359e1
14 changed files with 122 additions and 28 deletions
|
|
@ -1,6 +1,6 @@
|
|||
# S3 bucket for logs
|
||||
resource "aws_s3_bucket" "logs" {
|
||||
bucket = "dumpnet-logs"
|
||||
bucket = "${var.cluster_name}-logs"
|
||||
}
|
||||
|
||||
resource "aws_s3_bucket_lifecycle_configuration" "logs" {
|
||||
|
|
@ -10,7 +10,9 @@ resource "aws_s3_bucket_lifecycle_configuration" "logs" {
|
|||
id = "expire-old-logs"
|
||||
status = "Enabled"
|
||||
|
||||
filter {}
|
||||
filter {
|
||||
prefix = ""
|
||||
}
|
||||
|
||||
transition {
|
||||
days = 30
|
||||
|
|
@ -34,16 +36,16 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "logs" {
|
|||
|
||||
# Athena database + workgroup
|
||||
resource "aws_athena_database" "logs" {
|
||||
name = "dumpnet_logs"
|
||||
name = "${replace(var.cluster_name, "-", "_")}_logs"
|
||||
bucket = aws_s3_bucket.athena_results.bucket
|
||||
}
|
||||
|
||||
resource "aws_s3_bucket" "athena_results" {
|
||||
bucket = "dumpnet-athena-results"
|
||||
bucket = "${var.cluster_name}-athena-results"
|
||||
}
|
||||
|
||||
resource "aws_athena_workgroup" "logs" {
|
||||
name = "dumpnet-logs"
|
||||
name = "${var.cluster_name}-logs"
|
||||
|
||||
configuration {
|
||||
result_configuration {
|
||||
|
|
@ -58,7 +60,7 @@ resource "aws_athena_workgroup" "logs" {
|
|||
|
||||
# IAM user for fluent-bit to write to S3
|
||||
resource "aws_iam_user" "fluentbit" {
|
||||
name = "dumpnet-fluentbit"
|
||||
name = "${var.cluster_name}-fluentbit"
|
||||
}
|
||||
|
||||
resource "aws_iam_access_key" "fluentbit" {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue