Merge branch 'main' of github.com:aws/amazon-cloudwatch-agent-test in…

…to gpuE2eTest
aws · Jun 10, 2024 · dee4d19 · dee4d19
2 parents db41f67 + 515b327
commit dee4d19
Show file tree

Hide file tree

Showing 18 changed files with 865 additions and 58 deletions.
diff --git a/generator/resources/ec2_mac_test_matrix.json b/generator/resources/ec2_mac_test_matrix.json
@@ -1,16 +1,4 @@
 [
-      {
-        "os": "macOS Big Sur Arm64",
-        "instanceType":"mac2.metal",
-        "ami": "cloudwatch-agent-integration-test-mac-bigsur-arm64",
-        "arc": "arm64"
-      },
-      {
-        "os": "macOS Big Sur Amd64",
-        "instanceType":"mac1.metal",
-        "ami": "cloudwatch-agent-integration-test-mac-bigsur-x86",
-        "arc": "amd64"
-      },
       {
         "os": "macOS Ventura Arm64",
         "instanceType":"mac2.metal",

diff --git a/generator/resources/ec2_windows_test_matrix.json b/generator/resources/ec2_windows_test_matrix.json
@@ -5,12 +5,6 @@
     "ami": "cloudwatch-agent-integration-test-win-11*",
     "useSSM": false
   },
-  {
-    "os": "win-2012",
-    "instanceType":"t3a.medium",
-    "ami": "cloudwatch-agent-integration-test-win-2012*",
-    "useSSM": false
-  },
   {
     "os": "win-2016",
     "instanceType":"t3a.medium",

diff --git a/msi/tools/amazon-cloudwatch-agent.wxs b/msi/tools/amazon-cloudwatch-agent.wxs
@@ -44,6 +44,7 @@
       <ComponentRef Id='SchemaJSON' />
       <ComponentRef Id='DownloaderEXE' />
       <ComponentRef Id='TranslatorEXE' />
+      <ComponentRef Id='OtelJmxJar' />
       <ComponentRef Id='CWAGENT_VERSION' />
       <ComponentRef Id='LICENSE' />
       <ComponentRef Id='NOTICE' />
@@ -119,6 +120,9 @@
         <Component Id='TranslatorEXE' Guid='f4527006-edcb-4271-a971-039848bc8bb7' Win64='yes'>
             <File Source='config-translator.exe' KeyPath='yes' Checksum='yes'/>
         </Component>
+        <Component Id='OtelJmxJar' Guid='5af08c39-c483-4b08-8315-c99345684c4d' Win64='yes'>
+            <File Source='opentelemetry-jmx-metrics.jar' KeyPath='yes'/>
+        </Component>
         <Component Id='CWAGENT_VERSION' Guid='f4ddf7bf-48fc-41f6-a914-4153a7cf0afc' Win64='yes'>
             <File Source='CWAGENT_VERSION' KeyPath='yes'/>
         </Component>

diff --git a/...on/default_resources/cwagent-windows.yaml → ..._resources/cwagent-windows-daemonset.yaml b/...on/default_resources/cwagent-windows.yaml → ..._resources/cwagent-windows-daemonset.yaml
@@ -21,6 +21,7 @@ spec:
       containers:
         - name: cloudwatch-agent
           image: CW_TEST_IMAGE
+          workingDir: "%CONTAINER_SANDBOX_MOUNT_POINT%\\Program Files\\Amazon\\AmazonCloudWatchAgent"
           volumeMounts:
             - name: cwagentconfig
               mountPath: C:\Program Files\Amazon\AmazonCloudWatchAgent\cwagentconfig

diff --git a/terraform/eks/daemon/default_resources/fluenbit-windows-configmap.yaml b/terraform/eks/daemon/default_resources/fluenbit-windows-configmap.yaml
@@ -91,11 +91,22 @@ data:
         Refresh_Interval    10
         Read_from_Head      ${READ_FROM_HEAD}
 
+    [INPUT]
+        Name                winlog
+        Channels            EKS
+        DB                  C:\\var\\fluent-bit\\state\\flb_eks_winlog.db
+        Interval_Sec        60
+
     [FILTER]
         Name                aws
         Match               dataplane.*
         imds_version        v2
 
+    [FILTER]
+        Name                aws
+        Match               winlog.*
+        imds_version        v2
+
     [OUTPUT]
         Name                cloudwatch_logs
         Match               dataplane.*
@@ -105,10 +116,19 @@ data:
         auto_create_group   true
         extra_user_agent    container-insights
 
+    [OUTPUT]
+        Name                cloudwatch_logs
+        Match               winlog.*
+        region              ${AWS_REGION}
+        log_group_name      /aws/containerinsights/${CLUSTER_NAME}/dataplane
+        log_stream_name     ${HOST_NAME}.windows.kubelet.kubeproxy.service
+        auto_create_group   true
+        extra_user_agent    container-insights
+
   host-log.conf: |
     [INPUT]
         Name                winlog
-        Channels            EKS, System
+        Channels            System
         DB                  C:\\var\\fluent-bit\\state\\flb_system_winlog.db
         Interval_Sec        60
 
@@ -122,7 +142,7 @@ data:
         Match               winlog.*
         region              ${AWS_REGION}
         log_group_name      /aws/containerinsights/${CLUSTER_NAME}/host
-        log_stream_prefix   ${HOST_NAME}.
+        log_stream_name     ${HOST_NAME}.windows.system.events
         auto_create_group   true
         extra_user_agent    container-insights
 

diff --git a/terraform/eks/daemon/fluent/common/main.tf b/terraform/eks/daemon/fluent/common/main.tf
@@ -280,7 +280,7 @@ resource "kubernetes_daemonset" "agent_daemon" {
       spec {
         container {
           name  = "cloudwatch-agent"
-          image = "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247359.1b252618"
+          image = "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300040.0b650"
           resources {
             limits = {
               "cpu" : "200m",