From d8f66de2172e69af70e10897ea18c3211db4115b Mon Sep 17 00:00:00 2001 From: Varun C Date: Fri, 4 Oct 2024 00:22:59 +0000 Subject: [PATCH 1/2] Update test matrix to be in version order --- generator/resources/ec2_mac_test_matrix.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/generator/resources/ec2_mac_test_matrix.json b/generator/resources/ec2_mac_test_matrix.json index a1c8f9927..e2b663fd7 100644 --- a/generator/resources/ec2_mac_test_matrix.json +++ b/generator/resources/ec2_mac_test_matrix.json @@ -1,26 +1,26 @@ [ { - "os": "macOS Ventura Arm64", + "os": "macOS Monterey Arm64", "instanceType":"mac2.metal", - "ami": "cloudwatch-agent-integration-test-mac-ventura-arm64", + "ami": "cloudwatch-agent-integration-test-mac-monterey-arm64", "arc": "arm64" }, { - "os": "macOS Ventura Amd64", + "os": "macOS Monterey Amd64", "instanceType":"mac1.metal", - "ami": "cloudwatch-agent-integration-test-mac-ventura-x86", + "ami": "cloudwatch-agent-integration-test-mac-monterey-x86", "arc": "amd64" }, { - "os": "macOS Monterey Arm64", + "os": "macOS Ventura Arm64", "instanceType":"mac2.metal", - "ami": "cloudwatch-agent-integration-test-mac-monterey-arm64", + "ami": "cloudwatch-agent-integration-test-mac-ventura-arm64", "arc": "arm64" }, { - "os": "macOS Monterey Amd64", + "os": "macOS Ventura Amd64", "instanceType":"mac1.metal", - "ami": "cloudwatch-agent-integration-test-mac-monterey-x86", + "ami": "cloudwatch-agent-integration-test-mac-ventura-x86", "arc": "amd64" }, { From 67aa2e357db4ef4e5c99fd7a8f35703c172986ad Mon Sep 17 00:00:00 2001 From: Varun C Date: Fri, 4 Oct 2024 00:25:05 +0000 Subject: [PATCH 2/2] Fix typos in doc --- docs/license-manager-setup.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/license-manager-setup.md b/docs/license-manager-setup.md index 68031aca9..abdece258 100644 --- a/docs/license-manager-setup.md +++ b/docs/license-manager-setup.md @@ -10,7 +10,7 @@ License manager requires a license to manage all the dedicated hosts own by a ac 5. Provide `License name` and choose `Cores` for `Licence Type`. Leave the `Number of Cores` empty for default value and click `Submit` # 2. Associate AMI for license -In order launch dedicated host instances using License Manager, we have to associate AMI with the license we created. Note that we must own the AMI so to work around this we can copy existing AMI. +In order to launch dedicated host instances using License Manager, we have to associate AMI with the license we created. Note that we must own the AMI so to work around this we can copy existing AMI. 1. Go to EC2 page 2. Click on `AMIs` on the sidebar 3. Filter by `Public Images` and select the AMI you want to copy @@ -24,7 +24,7 @@ In order launch dedicated host instances using License Manager, we have to assoc Host resource group manages the host associated with the server-bound licenses and this is the group we will call to help us access available dedicated hosts 1. Go to AWS License Manager 2. Click on `Host resource groups` on the sidebar -3. Click on `Create sost resource groups` +3. Click on `Create host resource groups` 4. Provide `Host resource group name`, deselect `Release hosts automatically`, and use the license you created in step 1 for section `Associated self-managed licenses` 5. Click on `Create` @@ -46,7 +46,7 @@ resource "aws_instance" "cwagent" { associate_public_ip_address = true instance_initiated_shutdown_behavior = "terminate" tenancy = "host" - host_resource_group_arn = your_host_resourc_group_arn + host_resource_group_arn = your_host_resource_group_arn metadata_options { http_endpoint = "enabled"