feat(DMVP-5087): upgrade monitoring modules provider version and set …

…internal linking for log based metrics

README.md

@@ -29,7 +29,7 @@ git config core.hooksPath githooks
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~>4.50 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.50, < 6.0 |
 
 ## Providers
 
@@ -41,7 +41,7 @@ No providers.
 |------|--------|---------|
 | <a name="module_alerts"></a> [alerts](#module\_alerts) | ./modules/alerts/ | n/a |
 | <a name="module_alerts_slo_sli_sla"></a> [alerts\_slo\_sli\_sla](#module\_alerts\_slo\_sli\_sla) | ./modules/alerts/ | n/a |
-| <a name="module_aws_cloudwatch_log_metric_filter"></a> [aws\_cloudwatch\_log\_metric\_filter](#module\_aws\_cloudwatch\_log\_metric\_filter) | dasmeta/modules/aws//modules/cloudwatch-log-metric | 1.7.0 |
+| <a name="module_aws_cloudwatch_log_metric_filter"></a> [aws\_cloudwatch\_log\_metric\_filter](#module\_aws\_cloudwatch\_log\_metric\_filter) | ./modules/cloudwatch-log-based-metrics | n/a |
 | <a name="module_eks_monitoring_dashboard"></a> [eks\_monitoring\_dashboard](#module\_eks\_monitoring\_dashboard) | ./modules/dashboard/ | n/a |
 | <a name="module_health-check"></a> [health-check](#module\_health-check) | ./modules/alerts/ | n/a |
 | <a name="module_monitoring_dashboard"></a> [monitoring\_dashboard](#module\_monitoring\_dashboard) | ./modules/dashboard/ | n/a |
@@ -62,7 +62,7 @@ No resources.
 | <a name="input_enable_log_base_metrics"></a> [enable\_log\_base\_metrics](#input\_enable\_log\_base\_metrics) | n/a | `bool` | `true` | no |
 | <a name="input_expression_alert"></a> [expression\_alert](#input\_expression\_alert) | Add multiple metrics in one alert and add expression. | `any` | `{}` | no |
 | <a name="input_health_checks"></a> [health\_checks](#input\_health\_checks) | Health\_checks endpoints and paths | `any` | `[]` | no |
-| <a name="input_log_base_metrics"></a> [log\_base\_metrics](#input\_log\_base\_metrics) | Log Base Metrics | `any` | `[]` | no |
+| <a name="input_log_base_metrics"></a> [log\_base\_metrics](#input\_log\_base\_metrics) | Log Base Metrics creation configuration | <pre>list(object({<br> name = string<br> pattern = string<br> log_group_name = string<br> unit = optional(string, "None")<br> dimensions = optional(any, {})<br> value = optional(string, "1")<br> default_value = optional(string, "0")<br> }))</pre> | `[]` | no |
 | <a name="input_name"></a> [name](#input\_name) | Dashboard name | `string` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | The region where resources should be managed. In this repository it's secondary because IAM is always global. | `string` | `"eu-central-1"` | no |
 | <a name="input_sns_topic_name"></a> [sns\_topic\_name](#input\_sns\_topic\_name) | SNS topic name | `string` | `"cloudwatch-alarm"` | no |

log-base-metrics.tf

@@ -1,12 +1,5 @@
 module "aws_cloudwatch_log_metric_filter" {
- source = "dasmeta/modules/aws//modules/cloudwatch-log-metric"
- version = "1.7.0"
+ source = "./modules/cloudwatch-log-based-metrics"
 
- for_each = { for item in var.log_base_metrics : item.name => item if var.enable_log_base_metrics }
-
- name = each.value.name
- filter_pattern = each.value.filter
- create_log_group = lookup(each.value, "create_log_group", false)
- log_group_name = each.value.log_group_name
- metric_name = each.value.name
+ metrics_patterns = var.log_base_metrics
 }

modules/alerts/tests/insufficient-data-filled-alerts/README.md

@@ -11,7 +11,7 @@
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.67.0 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.33 |
 
 ## Modules
 

modules/cloudwatch-log-based-metrics/README.md

@@ -43,9 +43,9 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_log_group_name"></a> [log\_group\_name](#input\_log\_group\_name) | The name of cloudwatch log group on which the metric filters will apply | `string` | n/a | yes |
+| <a name="input_log_group_name"></a> [log\_group\_name](#input\_log\_group\_name) | The name of cloudwatch log group on which the metric filters will apply, one of var.log\_group\_name or var.metrics\_patterns.*.log\_group\_name is required | `string` | `null` | no |
 | <a name="input_metrics_namespace"></a> [metrics\_namespace](#input\_metrics\_namespace) | The namespace of cloudwatch metric | `string` | `"LogBasedMetrics"` | no |
-| <a name="input_metrics_patterns"></a> [metrics\_patterns](#input\_metrics\_patterns) | The configurations of log based metric filtration | <pre>list(object({<br> name = string<br> pattern = string<br> unit = optional(string, "None")<br> dimensions = optional(any, {})<br> value = optional(string, "1")<br> default_value = optional(string, "0")<br> }))</pre> | `[]` | no |
+| <a name="input_metrics_patterns"></a> [metrics\_patterns](#input\_metrics\_patterns) | The configurations of log based metric filtration, one of var.log\_group\_name or var.metrics\_patterns.*.log\_group\_name is required | <pre>list(object({<br> name  = string<br> pattern  = string<br> unit  = optional(string, "None")<br> dimensions  = optional(any, {})<br> value  = optional(string, "1")<br> default_value  = optional(string, "0")<br> log_group_name = optional(string, null)<br> }))</pre> | `[]` | no |
 
 ## Outputs
 

modules/cloudwatch-log-based-metrics/main.tf

@@ -3,7 +3,7 @@ resource "aws_cloudwatch_log_metric_filter" "metric_filter" {
 
  name = each.value.name
  pattern = each.value.pattern
- log_group_name = var.log_group_name
+ log_group_name = coalesce(each.value.log_group_name, var.log_group_name)
 
  metric_transformation {
  name = each.value.name

modules/cloudwatch-log-based-metrics/variables.tf

@@ -1,19 +1,21 @@
 variable "log_group_name" {
  type = string
- description = "The name of cloudwatch log group on which the metric filters will apply"
+ description = "The name of cloudwatch log group on which the metric filters will apply, one of var.log_group_name or var.metrics_patterns.*.log_group_name is required"
+ default = null
 }
 
 variable "metrics_patterns" {
  type = list(object({
- name = string
- pattern = string
- unit = optional(string, "None")
- dimensions = optional(any, {})
- value = optional(string, "1")
- default_value = optional(string, "0")
+ name = string
+ pattern = string
+ unit = optional(string, "None")
+ dimensions = optional(any, {})
+ value = optional(string, "1")
+ default_value = optional(string, "0")
+ log_group_name = optional(string, null)
  }))
  default = []
- description = "The configurations of log based metric filtration"
+ description = "The configurations of log based metric filtration, one of var.log_group_name or var.metrics_patterns.*.log_group_name is required"
 }
 
 variable "metrics_namespace" {

modules/dashboard/README.md

@@ -111,14 +111,14 @@ module "this" {
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.3 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.3, < 6.0 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.4.3 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.3 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.3, < 6.0 |
 
 ## Modules
 

modules/dashboard/modules/widgets/balancer/2xx/README.md

@@ -4,13 +4,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 
@@ -46,13 +46,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 

modules/dashboard/modules/widgets/balancer/2xx/versions.tf

@@ -4,7 +4,7 @@ terraform {
  required_providers {
  aws = {
  source = "hashicorp/aws"
- version = "~> 4.30"
+ version = ">= 4.30, < 6.0"
  }
  }
 }

modules/dashboard/modules/widgets/balancer/4xx/README.md

@@ -4,13 +4,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 
@@ -46,13 +46,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 

modules/dashboard/modules/widgets/balancer/4xx/versions.tf

@@ -4,7 +4,7 @@ terraform {
  required_providers {
  aws = {
  source = "hashicorp/aws"
- version = "~> 4.30"
+ version = ">= 4.30, < 6.0"
  }
  }
 }

modules/dashboard/modules/widgets/balancer/5xx/README.md

@@ -4,13 +4,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 
@@ -46,13 +46,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 

modules/dashboard/modules/widgets/balancer/5xx/versions.tf

@@ -4,7 +4,7 @@ terraform {
  required_providers {
  aws = {
  source = "hashicorp/aws"
- version = "~> 4.30"
+ version = ">= 4.30, < 6.0"
  }
  }
 }

modules/dashboard/modules/widgets/balancer/all-requests/README.md

@@ -4,13 +4,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 
@@ -46,13 +46,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 

modules/dashboard/modules/widgets/balancer/all-requests/versions.tf

@@ -4,7 +4,7 @@ terraform {
  required_providers {
  aws = {
  source = "hashicorp/aws"
- version = "~> 4.30"
+ version = ">= 4.30, < 6.0"
  }
  }
 }

modules/dashboard/modules/widgets/balancer/connection-issues/README.md

@@ -4,13 +4,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 
@@ -46,13 +46,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 

modules/dashboard/modules/widgets/balancer/connection-issues/versions.tf

@@ -4,7 +4,7 @@ terraform {
  required_providers {
  aws = {
  source = "hashicorp/aws"
- version = "~> 4.30"
+ version = ">= 4.30, < 6.0"
  }
  }
 }

modules/dashboard/modules/widgets/balancer/error-rate/README.md

@@ -4,13 +4,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 
@@ -46,13 +46,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 

modules/dashboard/modules/widgets/balancer/error-rate/versions.tf

@@ -4,7 +4,7 @@ terraform {
  required_providers {
  aws = {
  source = "hashicorp/aws"
- version = "~> 4.30"
+ version = ">= 4.30, < 6.0"
  }
  }
 }

modules/dashboard/modules/widgets/balancer/request-count/README.md

@@ -4,13 +4,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules
 
@@ -46,13 +46,13 @@
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
-| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 4.30 |
+| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.30, < 6.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 4.30 |
+| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 4.30, < 6.0 |
 
 ## Modules