From 2da9161d0a093b058ea8e056cb373174861b600d Mon Sep 17 00:00:00 2001 From: Bayron Carranza Date: Fri, 1 Mar 2024 14:15:55 -0600 Subject: [PATCH 1/4] eks-green-side-loki-promtail --- terraform-modules/aws/grafana/loki/promtail/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform-modules/aws/grafana/loki/promtail/main.tf b/terraform-modules/aws/grafana/loki/promtail/main.tf index 181cb2019..748f1e1dd 100644 --- a/terraform-modules/aws/grafana/loki/promtail/main.tf +++ b/terraform-modules/aws/grafana/loki/promtail/main.tf @@ -5,7 +5,7 @@ data "aws_region" "current" {} resource "aws_iam_role" "iam_for_lambda" { - name = "iam_for_lambda" + name = "iam_for_lambda-${var.cluster_name}" assume_role_policy = jsonencode({ "Version" : "2012-10-17", @@ -22,7 +22,7 @@ resource "aws_iam_role" "iam_for_lambda" { } resource "aws_iam_role_policy" "logs" { - name = "lambda-logs" + name = "lambda-logs-${var.cluster_name}" role = aws_iam_role.iam_for_lambda.name policy = jsonencode({ "Statement" : [ From 49cc9226510ab788b2a5cd19093923d50d77a2cb Mon Sep 17 00:00:00 2001 From: Bayron Carranza Date: Fri, 1 Mar 2024 14:17:31 -0600 Subject: [PATCH 2/4] cluster_name --- terraform-modules/aws/grafana/loki/promtail/variables.tf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/terraform-modules/aws/grafana/loki/promtail/variables.tf b/terraform-modules/aws/grafana/loki/promtail/variables.tf index e0ad7c4f0..de6542c17 100644 --- a/terraform-modules/aws/grafana/loki/promtail/variables.tf +++ b/terraform-modules/aws/grafana/loki/promtail/variables.tf @@ -95,3 +95,9 @@ variable "s3_bucket_filter_suffix" { description = "The S3 bucket filter_suffix" default = ".log.gz" } + +variable "cluster_name" { + type = string + description = "Cluster name where loki was installed and you need to add lambda-promtail." + default = "" +} From 8d94252ff9d7154d706bd7fef246213e5d5f7252 Mon Sep 17 00:00:00 2001 From: Bayron Carranza Date: Fri, 1 Mar 2024 14:34:38 -0600 Subject: [PATCH 3/4] dynamic names --- terraform-modules/aws/grafana/loki/promtail/main.tf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform-modules/aws/grafana/loki/promtail/main.tf b/terraform-modules/aws/grafana/loki/promtail/main.tf index 748f1e1dd..37df23c50 100644 --- a/terraform-modules/aws/grafana/loki/promtail/main.tf +++ b/terraform-modules/aws/grafana/loki/promtail/main.tf @@ -67,7 +67,7 @@ resource "aws_iam_role_policy" "logs" { } data "aws_iam_policy" "lambda_vpc_execution" { - name = "AWSLambdaVPCAccessExecutionRole" + name = "AWSLambdaVPCAccessExecutionRole-${var.cluster_name}" } resource "aws_iam_role_policy_attachment" "lambda_vpc_execution" { @@ -76,13 +76,13 @@ resource "aws_iam_role_policy_attachment" "lambda_vpc_execution" { } resource "aws_cloudwatch_log_group" "lambda_promtail" { - name = "/aws/lambda/lambda_promtail" + name = "/aws/lambda/lambda_promtail-${var.cluster_name}" retention_in_days = 14 } resource "aws_lambda_function" "lambda_promtail" { image_uri = var.lambda_promtail_image - function_name = "lambda_promtail" + function_name = "lambda_promtail-${var.cluster_name}" role = aws_iam_role.iam_for_lambda.arn kms_key_arn = var.kms_key_arn From 01d616781e38773fbaac697bb2b41385b7ef97fa Mon Sep 17 00:00:00 2001 From: Bayron Carranza Date: Fri, 1 Mar 2024 14:41:52 -0600 Subject: [PATCH 4/4] typoname --- terraform-modules/aws/grafana/loki/promtail/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform-modules/aws/grafana/loki/promtail/main.tf b/terraform-modules/aws/grafana/loki/promtail/main.tf index 37df23c50..413cf8955 100644 --- a/terraform-modules/aws/grafana/loki/promtail/main.tf +++ b/terraform-modules/aws/grafana/loki/promtail/main.tf @@ -67,7 +67,7 @@ resource "aws_iam_role_policy" "logs" { } data "aws_iam_policy" "lambda_vpc_execution" { - name = "AWSLambdaVPCAccessExecutionRole-${var.cluster_name}" + name = "AWSLambdaVPCAccessExecutionRole" } resource "aws_iam_role_policy_attachment" "lambda_vpc_execution" {