From e86c923772e946642b9094847e5e7126e1443336 Mon Sep 17 00:00:00 2001 From: Anthony Gauthier Date: Tue, 3 Oct 2023 15:35:31 -0400 Subject: [PATCH] fix(amp): fixed arn for AMP logging (#62) * fix(amp): fixed arn for AMP logging * fix(amp): enabled managed_prometheus module * terraform-docs: automated action --------- Co-authored-by: github-actions[bot] --- README.md | 1 + prometheus.tf | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 0050082..c5ea24c 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,7 @@ When you set up NAC the VPC endpoint URL will not have a route to the public URL | Name | Source | Version | |------|--------|---------| | [managed\_grafana](#module\_managed\_grafana) | github.com/liatrio/terraform-aws-managed-service-grafana.git | n/a | +| [managed\_prometheus](#module\_managed\_prometheus) | terraform-aws-modules/managed-service-prometheus/aws | n/a | ## Resources diff --git a/prometheus.tf b/prometheus.tf index fd33bfa..9675255 100644 --- a/prometheus.tf +++ b/prometheus.tf @@ -8,7 +8,7 @@ resource "aws_prometheus_workspace" "amp_ws" { alias = var.amp_ws_alias logging_configuration { - log_group_arn = aws_cloudwatch_log_group.amp_log_group.arn + log_group_arn = "${aws_cloudwatch_log_group.amp_log_group.arn}:*" } } @@ -69,12 +69,14 @@ resource "aws_iam_role_policy" "amp_role_policy" { } # TODO: We are currently flowing data through the workspace above, we will eventually want to move everything to the workspace being created by this public module. -# module "managed_prometheus" { -# count = var.enable_managed_prometheus == true ? 1 : 0 -# source = "terraform-aws-modules/managed-service-prometheus/aws" +module "managed_prometheus" { + count = var.enable_managed_prometheus == true ? 1 : 0 + source = "terraform-aws-modules/managed-service-prometheus/aws" -# create_workspace = var.amp_create_workspace == true ? var.amp_create_workspace : false -# workspace_id = var.amp_workspace_id + create_workspace = var.amp_create_workspace == true ? var.amp_create_workspace : false + workspace_id = var.amp_workspace_id -# logging_configuration = var.logging_configuration -# } + logging_configuration = { + log_group_arn = "${aws_cloudwatch_log_group.amp_log_group.arn}:*" + } +}