diff --git a/modules/cloudwatch-metrics/USAGE.md b/modules/cloudwatch-metrics/USAGE.md index fcb32f1..1e0ab01 100644 --- a/modules/cloudwatch-metrics/USAGE.md +++ b/modules/cloudwatch-metrics/USAGE.md @@ -43,7 +43,7 @@ | [name](#input\_name) | A unique name for this CloudWatch Metric Stream. | `string` | `"honeycomb-cloudwatch-metrics"` | no | | [namespace\_exclude\_filters](#input\_namespace\_exclude\_filters) | DEPRECATED: use `include_filters` instead.

An optional list of CloudWatch Metric namespaces to exclude. If set, we'll only stream metrics that are not in these namespaces.
Mutually exclusive with `namespace_include_filters`. | `list(string)` | `[]` | no | | [namespace\_include\_filters](#input\_namespace\_include\_filters) | DEPRECATED: use `include_filters` instead.

An optional list of CloudWatch Metric namespaces to include. If set, we'll only stream metrics from these namespaces.
Mutually exclusive with `namespace_exclude_filters`. | `list(string)` | `[]` | no | -| [output\_format](#input\_output\_format) | Output format of metrics. You should probably not modify this value; the default format is supported, but others may not be. | `string` | `"opentelemetry0.7"` | no | +| [output\_format](#input\_output\_format) | Output format of metrics. You should probably not modify this value; the default format is supported, but others may not be. | `string` | `"opentelemetry1.0"` | no | | [s3\_backup\_mode](#input\_s3\_backup\_mode) | Should we only backup to S3 data that failed delivery, or all data? | `string` | `"FailedDataOnly"` | no | | [s3\_buffer\_interval](#input\_s3\_buffer\_interval) | In seconds. See https://docs.aws.amazon.com/firehose/latest/dev/create-configure.html | `number` | `400` | no | | [s3\_buffer\_size](#input\_s3\_buffer\_size) | In MiB. See https://docs.aws.amazon.com/firehose/latest/dev/create-configure.html | `number` | `10` | no | @@ -57,4 +57,4 @@ |------|-------------| | [cloudwatch\_metric\_stream\_arn](#output\_cloudwatch\_metric\_stream\_arn) | n/a | | [cloudwatch\_metric\_stream\_name](#output\_cloudwatch\_metric\_stream\_name) | n/a | - \ No newline at end of file + diff --git a/modules/cloudwatch-metrics/variables.tf b/modules/cloudwatch-metrics/variables.tf index 44444a9..d39fc6e 100644 --- a/modules/cloudwatch-metrics/variables.tf +++ b/modules/cloudwatch-metrics/variables.tf @@ -144,11 +144,11 @@ variable "s3_backup_mode" { variable "output_format" { type = string - default = "opentelemetry0.7" + default = "opentelemetry1.0" description = "Output format of metrics. You should probably not modify this value; the default format is supported, but others may not be." validation { - condition = contains(["json", "opentelemetry0.7"], var.output_format) + condition = contains(["json", "opentelemetry0.7", "opentelemetry1.0"], var.output_format) error_message = "Not an allowed output format." } }