Skip to content

Commit 11e818c

Browse files
authored
Merge branch 'main' into update-deps
2 parents 0845851 + f304e5f commit 11e818c

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

src/docs/getting-started/adot-eks-add-on/config-cloudwatch.mdx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,11 @@ spec:
360360
parse_json_encoded_attr_values: [Sources, kubernetes]
361361
metric_declarations:
362362
- dimensions: [[EKS_Cluster, EKS_Namespace, EKS_PodName]]
363+
metric_name_selectors:
364+
- apiserver_request_.*
365+
- container_memory_.*
366+
- container_threads
367+
- otelcol_process_.*
363368
service:
364369
pipelines:
365370
metrics:

src/docs/getting-started/lambda/lambda-java-auto-instr.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Find the supported regions and AMD64 (x86_64) layer ARN in the table below for t
2929

3030
|Supported Regions |Lambda layer ARN format | Contents |
3131
|---------------------|-------------------------|----------|
32-
| ap-northeast-1<br/>ap-northeast-2<br/>ap-south-1<br/>ap-southeast-1<br/>ap-southeast-2<br/>ca-central-1<br/>eu-central-1<br/>eu-north-1<br/>eu-west-1<br/>eu-west-2<br/>eu-west-3<br/>sa-east-1<br/>us-east-1<br/>us-east-2<br/>us-west-1<br/>us-west-2 | arn:aws:lambda:<region\>:901920570463:layer:aws-otel-java-agent-amd64-ver-1-16-0:6 | Contains [ADOT Java Auto-Instrumentation Agent v1.17.0](https://github.com/aws-observability/aws-otel-java-instrumentation/releases/tag/v1.17.0) <br/><br/> Contains the [ADOT Collector for Lambda v0.21.0](https://github.com/aws-observability/aws-otel-collector/releases/tag/pkg%2Flambdacomponents%2Fv0.21.0)|
32+
| ap-northeast-1<br/>ap-northeast-2<br/>ap-south-1<br/>ap-southeast-1<br/>ap-southeast-2<br/>ca-central-1<br/>eu-central-1<br/>eu-north-1<br/>eu-west-1<br/>eu-west-2<br/>eu-west-3<br/>sa-east-1<br/>us-east-1<br/>us-east-2<br/>us-west-1<br/>us-west-2 | arn:aws:lambda:<region\>:901920570463:layer:aws-otel-java-agent-amd64-ver-1-17-0:6 | Contains [ADOT Java Auto-Instrumentation Agent v1.17.0](https://github.com/aws-observability/aws-otel-java-instrumentation/releases/tag/v1.17.0) <br/><br/> Contains the [ADOT Collector for Lambda v0.21.0](https://github.com/aws-observability/aws-otel-collector/releases/tag/pkg%2Flambdacomponents%2Fv0.21.0)|
3333

3434
Find the supported regions and ARM64 layer ARN in the table below for the ARNs to consume.
3535

0 commit comments

Comments
 (0)