Skip to content

Commit 99732ae

Browse files
authored
Support new telemetry types for oam (#31)
1 parent d7b7723 commit 99732ae

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

modules/cloudwatch-oam-link/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ This module creates following resources.
88

99
| Name | Version |
1010
|------|---------|
11-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5 |
11+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.6 |
1212
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.63 |
1313

1414
## Providers
1515

1616
| Name | Version |
1717
|------|---------|
18-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.19.0 |
18+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.51.0 |
1919

2020
## Modules
2121

@@ -41,7 +41,7 @@ This module creates following resources.
4141
| <a name="input_resource_group_enabled"></a> [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 |
4242
| <a name="input_resource_group_name"></a> [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 |
4343
| <a name="input_tags"></a> [tags](#input\_tags) | (Optional) A map of tags to add to all resources. | `map(string)` | `{}` | no |
44-
| <a name="input_telemetry_types"></a> [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 |
44+
| <a name="input_telemetry_types"></a> [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 |
4545

4646
## Outputs
4747

modules/cloudwatch-oam-link/variables.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ variable "account_label" {
2323
}
2424

2525
variable "telemetry_types" {
26-
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`."
26+
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`."
2727
type = set(string)
2828
default = []
2929
nullable = false
3030

3131
validation {
3232
condition = alltrue([
3333
for telemetry_type in var.telemetry_types :
34-
contains(["AWS::CloudWatch::Metric", "AWS::Logs::LogGroup", "AWS::XRay::Trace"], telemetry_type)
34+
contains(["AWS::CloudWatch::Metric", "AWS::Logs::LogGroup", "AWS::XRay::Trace", "AWS::ApplicationInsights::Application", "AWS::InternetMonitor::Monitor"], telemetry_type)
3535
])
36-
error_message = "Valid values for `telemetry_types` are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`."
36+
error_message = "Valid values for `telemetry_types` are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`, `AWS::ApplicationInsights::Application`, `AWS::InternetMonitor::Monitor`."
3737
}
3838
}
3939

modules/cloudwatch-oam-link/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.5"
2+
required_version = ">= 1.6"
33

44
required_providers {
55
aws = {

modules/cloudwatch-oam-sink/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ This module creates following resources.
99

1010
| Name | Version |
1111
|------|---------|
12-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.5 |
12+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.6 |
1313
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.63 |
1414

1515
## Providers
1616

1717
| Name | Version |
1818
|------|---------|
19-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.19.0 |
19+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.51.0 |
2020

2121
## Modules
2222

@@ -44,7 +44,7 @@ This module creates following resources.
4444
| <a name="input_resource_group_enabled"></a> [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 |
4545
| <a name="input_resource_group_name"></a> [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 |
4646
| <a name="input_tags"></a> [tags](#input\_tags) | (Optional) A map of tags to add to all resources. | `map(string)` | `{}` | no |
47-
| <a name="input_telemetry_types"></a> [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 |
47+
| <a name="input_telemetry_types"></a> [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 |
4848

4949
## Outputs
5050

modules/cloudwatch-oam-sink/variables.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ variable "name" {
55
}
66

77
variable "telemetry_types" {
8-
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`."
8+
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`."
99
type = set(string)
1010
default = []
1111
nullable = false
1212

1313
validation {
1414
condition = alltrue([
1515
for telemetry_type in var.telemetry_types :
16-
contains(["AWS::CloudWatch::Metric", "AWS::Logs::LogGroup", "AWS::XRay::Trace"], telemetry_type)
16+
contains(["AWS::CloudWatch::Metric", "AWS::Logs::LogGroup", "AWS::XRay::Trace", "AWS::ApplicationInsights::Application", "AWS::InternetMonitor::Monitor"], telemetry_type)
1717
])
18-
error_message = "Valid values for `telemetry_types` are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`."
18+
error_message = "Valid values for `telemetry_types` are `AWS::CloudWatch::Metric`, `AWS::Logs::LogGroup`, `AWS::XRay::Trace`, `AWS::ApplicationInsights::Application`, `AWS::InternetMonitor::Monitor`."
1919
}
2020
}
2121

modules/cloudwatch-oam-sink/versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.5"
2+
required_version = ">= 1.6"
33

44
required_providers {
55
aws = {

0 commit comments

Comments
 (0)