From f29c1128320c146e290eb2da0464e8129819d825 Mon Sep 17 00:00:00 2001 From: Byungjin Park Date: Fri, 24 May 2024 14:39:24 +0900 Subject: [PATCH] Support new telemetry types for oam --- modules/cloudwatch-oam-link/README.md | 6 +++--- modules/cloudwatch-oam-link/variables.tf | 6 +++--- modules/cloudwatch-oam-link/versions.tf | 2 +- modules/cloudwatch-oam-sink/README.md | 6 +++--- modules/cloudwatch-oam-sink/variables.tf | 6 +++--- modules/cloudwatch-oam-sink/versions.tf | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/cloudwatch-oam-link/README.md b/modules/cloudwatch-oam-link/README.md index 45cb59d..0af0f7a 100644 --- a/modules/cloudwatch-oam-link/README.md +++ b/modules/cloudwatch-oam-link/README.md @@ -8,14 +8,14 @@ This module creates following resources. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.5 | +| [terraform](#requirement\_terraform) | >= 1.6 | | [aws](#requirement\_aws) | >= 4.63 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.19.0 | +| [aws](#provider\_aws) | 5.51.0 | ## Modules @@ -41,7 +41,7 @@ This module creates following resources. | [resource\_group\_enabled](#input\_resource\_group\_enabled) | (Optional) Whether to create Resource Group to find and group AWS resources which are created by this module. | `bool` | `true` | no | | [resource\_group\_name](#input\_resource\_group\_name) | (Optional) The name of Resource Group. A Resource Group name can have a maximum of 127 characters, including letters, numbers, hyphens, dots, and underscores. The name cannot start with `AWS` or `aws`. | `string` | `""` | no | | [tags](#input\_tags) | (Optional) A map of tags to add to all resources. | `map(string)` | `{}` | no | -| [telemetry\_types](#input\_telemetry\_types) | (Optional) A set of the telemetry types that the source account shares with the monitoring account. Valid values are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`. | `set(string)` | `[]` | no | +| [telemetry\_types](#input\_telemetry\_types) | (Optional) A set of the telemetry types that the source account shares with the monitoring account. Valid values are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`, `AWS::ApplicationInsights::Application`, `AWS::InternetMonitor::Monitor`. | `set(string)` | `[]` | no | ## Outputs diff --git a/modules/cloudwatch-oam-link/variables.tf b/modules/cloudwatch-oam-link/variables.tf index 8cd55fa..aa8ebe4 100644 --- a/modules/cloudwatch-oam-link/variables.tf +++ b/modules/cloudwatch-oam-link/variables.tf @@ -23,7 +23,7 @@ variable "account_label" { } variable "telemetry_types" { - description = "(Optional) A set of the telemetry types that the source account shares with the monitoring account. Valid values are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`." + description = "(Optional) A set of the telemetry types that the source account shares with the monitoring account. Valid values are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`, `AWS::ApplicationInsights::Application`, `AWS::InternetMonitor::Monitor`." type = set(string) default = [] nullable = false @@ -31,9 +31,9 @@ variable "telemetry_types" { validation { condition = alltrue([ for telemetry_type in var.telemetry_types : - contains(["AWS::CloudWatch::Metric", "AWS::Logs::LogGroup", "AWS::XRay::Trace"], telemetry_type) + contains(["AWS::CloudWatch::Metric", "AWS::Logs::LogGroup", "AWS::XRay::Trace", "AWS::ApplicationInsights::Application", "AWS::InternetMonitor::Monitor"], telemetry_type) ]) - error_message = "Valid values for `telemetry_types` are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`." + error_message = "Valid values for `telemetry_types` are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`, `AWS::ApplicationInsights::Application`, `AWS::InternetMonitor::Monitor`." } } diff --git a/modules/cloudwatch-oam-link/versions.tf b/modules/cloudwatch-oam-link/versions.tf index bcd397c..fb7ae9e 100644 --- a/modules/cloudwatch-oam-link/versions.tf +++ b/modules/cloudwatch-oam-link/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.5" + required_version = ">= 1.6" required_providers { aws = { diff --git a/modules/cloudwatch-oam-sink/README.md b/modules/cloudwatch-oam-sink/README.md index f58a518..d30442c 100644 --- a/modules/cloudwatch-oam-sink/README.md +++ b/modules/cloudwatch-oam-sink/README.md @@ -9,14 +9,14 @@ This module creates following resources. | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.5 | +| [terraform](#requirement\_terraform) | >= 1.6 | | [aws](#requirement\_aws) | >= 4.63 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | 5.19.0 | +| [aws](#provider\_aws) | 5.51.0 | ## Modules @@ -44,7 +44,7 @@ This module creates following resources. | [resource\_group\_enabled](#input\_resource\_group\_enabled) | (Optional) Whether to create Resource Group to find and group AWS resources which are created by this module. | `bool` | `true` | no | | [resource\_group\_name](#input\_resource\_group\_name) | (Optional) The name of Resource Group. A Resource Group name can have a maximum of 127 characters, including letters, numbers, hyphens, dots, and underscores. The name cannot start with `AWS` or `aws`. | `string` | `""` | no | | [tags](#input\_tags) | (Optional) A map of tags to add to all resources. | `map(string)` | `{}` | no | -| [telemetry\_types](#input\_telemetry\_types) | (Optional) A set of the telemetry types can be shared with it. Valid values are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`. | `set(string)` | `[]` | no | +| [telemetry\_types](#input\_telemetry\_types) | (Optional) A set of the telemetry types can be shared with it. Valid values are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`, `AWS::ApplicationInsights::Application`, `AWS::InternetMonitor::Monitor`. | `set(string)` | `[]` | no | ## Outputs diff --git a/modules/cloudwatch-oam-sink/variables.tf b/modules/cloudwatch-oam-sink/variables.tf index 75ec136..935bf43 100644 --- a/modules/cloudwatch-oam-sink/variables.tf +++ b/modules/cloudwatch-oam-sink/variables.tf @@ -5,7 +5,7 @@ variable "name" { } variable "telemetry_types" { - description = "(Optional) A set of the telemetry types can be shared with it. Valid values are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`." + description = "(Optional) A set of the telemetry types can be shared with it. Valid values are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`, `AWS::ApplicationInsights::Application`, `AWS::InternetMonitor::Monitor`." type = set(string) default = [] nullable = false @@ -13,9 +13,9 @@ variable "telemetry_types" { validation { condition = alltrue([ for telemetry_type in var.telemetry_types : - contains(["AWS::CloudWatch::Metric", "AWS::Logs::LogGroup", "AWS::XRay::Trace"], telemetry_type) + contains(["AWS::CloudWatch::Metric", "AWS::Logs::LogGroup", "AWS::XRay::Trace", "AWS::ApplicationInsights::Application", "AWS::InternetMonitor::Monitor"], telemetry_type) ]) - error_message = "Valid values for `telemetry_types` are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`." + error_message = "Valid values for `telemetry_types` are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`, `AWS::ApplicationInsights::Application`, `AWS::InternetMonitor::Monitor`." } } diff --git a/modules/cloudwatch-oam-sink/versions.tf b/modules/cloudwatch-oam-sink/versions.tf index bcd397c..fb7ae9e 100644 --- a/modules/cloudwatch-oam-sink/versions.tf +++ b/modules/cloudwatch-oam-sink/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.5" + required_version = ">= 1.6" required_providers { aws = {