fix: Fix dependencies and implementation of the logging configuration support feature (#9)

* fix dependencies between the workspace and the alert manager definition and rule group namespace + addition of logging configuration support

* fix tf version to be upper than 4.35

* update after iteration on the PR

Co-authored-by: Samuel CHNIBER <[email protected]>

Author: schniber

README.md

@@ -57,13 +57,13 @@ Examples codified under the [`examples`](https://github.com/terraform-aws-module
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.1 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.35 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.1 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.35 |
 
 ## Modules
 
@@ -84,6 +84,7 @@ No modules.
 | <a name="input_alert_manager_definition"></a> [alert\_manager\_definition](#input\_alert\_manager\_definition) | The alert manager definition that you want to be applied. See more in the [AWS Docs](https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-alert-manager.html) | `string` | `"alertmanager_config: |\n  route:\n    receiver: 'default'\n  receivers:\n    - name: 'default'\n"` | no |
 | <a name="input_create"></a> [create](#input\_create) | Determines whether a resources will be created | `bool` | `true` | no |
 | <a name="input_create_workspace"></a> [create\_workspace](#input\_create\_workspace) | Determines whether a workspace will be created or to use an existing workspace | `bool` | `true` | no |
+| <a name="input_logging_configuration"></a> [logging\_configuration](#input\_logging\_configuration) | The logging configuration of the prometheus workspace. | `map(string)` | `{}` | no |
 | <a name="input_rule_group_namespaces"></a> [rule\_group\_namespaces](#input\_rule\_group\_namespaces) | A map of one or more rule group namespace definitions | `map(any)` | `{}` | no |
 | <a name="input_tags"></a> [tags](#input\_tags) | A map of tags to add to all resources | `map(string)` | `{}` | no |
 | <a name="input_workspace_alias"></a> [workspace\_alias](#input\_workspace\_alias) | The alias of the prometheus workspace. See more in the [AWS Docs](https://docs.aws.amazon.com/prometheus/latest/userguide/AMP-onboard-create-workspace.html) | `string` | `null` | no |

examples/complete/README.md

@@ -24,11 +24,13 @@ Note that this example may create resources which will incur monetary charges on
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.1 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.35 |
 
 ## Providers
 
-No providers.
+| Name | Version |
+|------|---------|
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.35 |
 
 ## Modules
 
@@ -40,7 +42,9 @@ No providers.
 
 ## Resources
 
-No resources.
+| Name | Type |
+|------|------|
+| [aws_cloudwatch_log_group.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
 
 ## Inputs
 

examples/complete/main.tf

@@ -15,6 +15,9 @@ module "prometheus" {
   source = "../.."
 
   workspace_alias = local.name
+  logging_configuration = {
+    log_group_arn = aws_cloudwatch_log_group.this.arn
+  }
 
   alert_manager_definition = <<-EOT
   alertmanager_config: |
@@ -59,3 +62,10 @@ module "default" {
 
   workspace_alias = "${local.name}-default"
 }
+
+################################################################################
+# Supporting Resources
+################################################################################
+resource "aws_cloudwatch_log_group" "this" {
+  name = "example-aws-managed-service-prometheus-complete"
+}

examples/complete/versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 4.1"
+      version = ">= 4.35"
     }
   }
 }

main.tf

@@ -1,5 +1,5 @@
 locals {
-  workspace_id = var.create_workspace ? aws_prometheus_workspace.this[0].id : var.workspace_id
+  workspace_id = var.create && var.create_workspace ? aws_prometheus_workspace.this[0].id : var.workspace_id
 }
 
 ################################################################################
@@ -10,7 +10,16 @@ resource "aws_prometheus_workspace" "this" {
   count = var.create && var.create_workspace ? 1 : 0
 
   alias = var.workspace_alias
-  tags  = var.tags
+
+  dynamic "logging_configuration" {
+    for_each = length(var.logging_configuration) > 0 ? [var.logging_configuration] : []
+
+    content {
+      log_group_arn = logging_configuration.value.log_group_arn
+    }
+  }
+
+  tags = var.tags
 }
 
 ################################################################################

variables.tf

@@ -32,6 +32,12 @@ variable "workspace_alias" {
   default     = null
 }
 
+variable "logging_configuration" {
+  description = "The logging configuration of the prometheus workspace."
+  type        = map(string)
+  default     = {}
+}
+
 ################################################################################
 # Alert Manager Definition
 ################################################################################

versions.tf

@@ -4,7 +4,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = ">= 4.1"
+      version = ">= 4.35"
     }
   }
 }