aws-samples · TravisStark · Jul 18, 2025 · May 28, 2025
diff --git a/container-insights-manifest-update.sh b/container-insights-manifest-update.sh
@@ -1,106 +1,76 @@
 #!/usr/bin/env bash
 
 cd "$(dirname "$0")"
-k8sDirPrefix="./k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring"
-k8sQSDirPrefix="./k8s-quickstart"
-ecsDirPrefix="./ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric"
 
-newK8sVersion="k8s/1.3.34"
-agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123"
+# Version definitions
+newK8sVersion="k8s/1.3.35"
+agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161"
 fluentdVersion="fluent/fluentd-kubernetes-daemonset:v1.10.3-debian-cloudwatch-1.0"
 fluentBitVersion="public.ecr.aws/aws-observability/aws-for-fluent-bit:2.32.4"
 fluentBitWindowsVersion="public.ecr.aws/aws-observability/aws-for-fluent-bit:windowsservercore-stable"
 
-k8sPrometheusDirPrefix="./k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus"
-ecsPrometheusDirPrefix="./ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus"
-
-# replace agent version for ECS Prometheus
-sed -i'.bak' "s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${ecsPrometheusDirPrefix}/cwagent-prometheus-task-definition.json
-rm ${ecsPrometheusDirPrefix}/cwagent-prometheus-task-definition.json.bak
-sed -i'.bak' "s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${ecsPrometheusDirPrefix}/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml
-rm ${ecsPrometheusDirPrefix}/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml.bak
-sed -i'.bak' "s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${ecsPrometheusDirPrefix}/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml
-rm ${ecsPrometheusDirPrefix}/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml.bak
-
-# replace agent and k8s version for K8s Prometheus
-sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sPrometheusDirPrefix}/prometheus-eks.yaml
-rm ${k8sPrometheusDirPrefix}/prometheus-eks.yaml.bak
-sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sPrometheusDirPrefix}/prometheus-eks-fargate.yaml
-rm ${k8sPrometheusDirPrefix}/prometheus-eks-fargate.yaml.bak
-sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sPrometheusDirPrefix}/prometheus-k8s.yaml
-rm ${k8sPrometheusDirPrefix}/prometheus-k8s.yaml.bak
-sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sPrometheusDirPrefix}/prometheus-eks-windows-exporter.yaml
-rm ${k8sPrometheusDirPrefix}/prometheus-eks-windows-exporter.yaml.bak
-
-
-# replace agent version for ECS
-sed -i'.bak' "s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${ecsDirPrefix}/cwagent-ecs-instance-metric.json
-rm ${ecsDirPrefix}/cwagent-ecs-instance-metric.json.bak
-
-sed -i'.bak' "s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${ecsDirPrefix}/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json
-rm ${ecsDirPrefix}/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json.bak
-
-# replace agent, fluentD and fluent-bit version for K8s
-sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sDirPrefix}/cwagent/cwagent-daemonset.yaml
-rm ${k8sDirPrefix}/cwagent/cwagent-daemonset.yaml.bak
-
-sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sDirPrefix}/cwagent/cwagent-daemonset-windows.yaml
-rm ${k8sDirPrefix}/cwagent/cwagent-daemonset-windows.yaml.bak
-
-sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sQSDirPrefix}/cwagent-operator-rendered.yaml
-rm ${k8sQSDirPrefix}/cwagent-operator-rendered.yaml.bak
-
-sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|${agentVersion}|g" ${k8sQSDirPrefix}/cwagent-version.yaml
-rm ${k8sQSDirPrefix}/cwagent-version.yaml.bak
-
-sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|fluent/fluentd-kubernetes-daemonset:.*|${fluentdVersion}|g" ${k8sDirPrefix}/fluentd/fluentd.yaml
-rm ${k8sDirPrefix}/fluentd/fluentd.yaml.bak
-
-sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/aws-observability/aws-for-fluent-bit.*|${fluentBitVersion}|g" ${k8sDirPrefix}/fluent-bit/fluent-bit.yaml
-rm ${k8sDirPrefix}/fluent-bit/fluent-bit.yaml.bak
-
-sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/aws-observability/aws-for-fluent-bit.*|${fluentBitWindowsVersion}|g" ${k8sDirPrefix}/fluent-bit/fluent-bit-windows.yaml
-rm ${k8sDirPrefix}/fluent-bit/fluent-bit-windows.yaml.bak
-
-sed -i'.bak' "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|${newK8sVersion}|g;s|public\.ecr\.aws/aws-observability/aws-for-fluent-bit.*|${fluentBitVersion}|g" ${k8sDirPrefix}/fluent-bit/fluent-bit-compatible.yaml
-rm ${k8sDirPrefix}/fluent-bit/fluent-bit-compatible.yaml.bak
-
-# generate quickstart manifest for K8s
-OUTPUT=${k8sDirPrefix}/quickstart/cwagent-fluentd-quickstart.yaml
-OUTPUT_FLUENT_BIT=${k8sDirPrefix}/quickstart/cwagent-fluent-bit-quickstart.yaml
-OUTPUT_FLUENT_BIT_WINDOWS=${k8sDirPrefix}/quickstart/cwagent-fluent-bit-quickstart-windows.yaml
-
-cat ${k8sDirPrefix}/cloudwatch-namespace.yaml > ${OUTPUT}
+# update all YAML and JSON files
+find . -type f \( -name "*.yaml" -o -name "*.json" \) -exec bash -c '
+    file="$1"
+    echo "Processing $file"
+    sed -i".bak" "s|k8s/[0-9]*\.[0-9]*\.[0-9a-z]*|'"$newK8sVersion"'|g;s|public\.ecr\.aws/cloudwatch-agent/cloudwatch-agent:[0-9]*\.[0-9]*\.[0-9a-z]*|'"$agentVersion"'|g" "$file"
+    rm -f "$file.bak"
+' bash {} \;
+
+# update fluent-related files
+find . -type f -name "fluent*.yaml" -exec bash -c '
+    file="$1"
+    if [[ $file == *"windows"* ]]; then
+        sed -i".bak" "s|public\.ecr\.aws/aws-observability/aws-for-fluent-bit.*|'"$fluentBitWindowsVersion"'|g" "$file"
+    elif [[ $file == *"fluent-bit"* ]]; then
+        sed -i".bak" "s|public\.ecr\.aws/aws-observability/aws-for-fluent-bit.*|'"$fluentBitVersion"'|g" "$file"
+    elif [[ $file == *"fluentd"* ]]; then
+        sed -i".bak" "s|fluent/fluentd-kubernetes-daemonset:.*|'"$fluentdVersion"'|g" "$file"
+    fi
+    rm -f "$file.bak"
+' bash {} \;
+
+# generate quickstart manifests
+k8sMonitoringPrefix="./k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring"
+OUTPUT="${k8sMonitoringPrefix}/quickstart/cwagent-fluentd-quickstart.yaml"
+OUTPUT_FLUENT_BIT="${k8sMonitoringPrefix}/quickstart/cwagent-fluent-bit-quickstart.yaml"
+OUTPUT_FLUENT_BIT_WINDOWS="${k8sMonitoringPrefix}/quickstart/cwagent-fluent-bit-quickstart-windows.yaml"
+
+# generate cwagent-fluentd-quickstart.yaml
+cat ${k8sMonitoringPrefix}/cloudwatch-namespace.yaml > ${OUTPUT}
 echo -e "\n---\n" >> ${OUTPUT}
-cat ${k8sDirPrefix}/cwagent/cwagent-serviceaccount.yaml >> ${OUTPUT}
+cat ${k8sMonitoringPrefix}/cwagent/cwagent-serviceaccount.yaml >> ${OUTPUT}
 echo -e "\n---\n" >> ${OUTPUT}
-cat ${k8sDirPrefix}/cwagent/cwagent-configmap.yaml | sed "s|\"logs|\"agent\": {\\
+cat ${k8sMonitoringPrefix}/cwagent/cwagent-configmap.yaml | sed "s|\"logs|\"agent\": {\\
         \"region\": \"{{region_name}}\"\\
       },\\
       \"logs|g" >> ${OUTPUT}
 echo -e "\n---\n" >> ${OUTPUT}
-cat ${k8sDirPrefix}/cwagent/cwagent-daemonset.yaml >> ${OUTPUT}
+cat ${k8sMonitoringPrefix}/cwagent/cwagent-daemonset.yaml >> ${OUTPUT}
 echo -e "\n---\n" >> ${OUTPUT}
-cat ${k8sDirPrefix}/fluentd/fluentd-configmap.yaml >> ${OUTPUT}
+cat ${k8sMonitoringPrefix}/fluentd/fluentd-configmap.yaml >> ${OUTPUT}
 echo -e "\n---\n" >> ${OUTPUT}
-cat ${k8sDirPrefix}/fluentd/fluentd.yaml >> ${OUTPUT}
+cat ${k8sMonitoringPrefix}/fluentd/fluentd.yaml >> ${OUTPUT}
 
-
-cat ${k8sDirPrefix}/cloudwatch-namespace.yaml > ${OUTPUT_FLUENT_BIT}
+# Generate cwagent-fluent-bit-quickstart.yaml
+cat ${k8sMonitoringPrefix}/cloudwatch-namespace.yaml > ${OUTPUT_FLUENT_BIT}
 echo -e "\n---\n" >> ${OUTPUT_FLUENT_BIT}
-cat ${k8sDirPrefix}/cwagent/cwagent-serviceaccount.yaml >> ${OUTPUT_FLUENT_BIT}
+cat ${k8sMonitoringPrefix}/cwagent/cwagent-serviceaccount.yaml >> ${OUTPUT_FLUENT_BIT}
 echo -e "\n---\n" >> ${OUTPUT_FLUENT_BIT}
-cat ${k8sDirPrefix}/cwagent/cwagent-configmap.yaml | sed "s|\"logs|\"agent\": {\\
+cat ${k8sMonitoringPrefix}/cwagent/cwagent-configmap.yaml | sed "s|\"logs|\"agent\": {\\
         \"region\": \"{{region_name}}\"\\
       },\\
       \"logs|g" >> ${OUTPUT_FLUENT_BIT}
 echo -e "\n---\n" >> ${OUTPUT_FLUENT_BIT}
-cat ${k8sDirPrefix}/cwagent/cwagent-daemonset.yaml >> ${OUTPUT_FLUENT_BIT}
+cat ${k8sMonitoringPrefix}/cwagent/cwagent-daemonset.yaml >> ${OUTPUT_FLUENT_BIT}
 echo -e "\n---\n" >> ${OUTPUT_FLUENT_BIT}
-cat ${k8sDirPrefix}/fluent-bit/fluent-bit-configmap.yaml >> ${OUTPUT_FLUENT_BIT}
+cat ${k8sMonitoringPrefix}/fluent-bit/fluent-bit-configmap.yaml >> ${OUTPUT_FLUENT_BIT}
 echo -e "\n---\n" >> ${OUTPUT_FLUENT_BIT}
-cat ${k8sDirPrefix}/fluent-bit/fluent-bit.yaml >> ${OUTPUT_FLUENT_BIT}
+cat ${k8sMonitoringPrefix}/fluent-bit/fluent-bit.yaml >> ${OUTPUT_FLUENT_BIT}
 
-cat ${k8sDirPrefix}/cwagent/cwagent-daemonset-windows.yaml > ${OUTPUT_FLUENT_BIT_WINDOWS}
+# Generate cwagent-fluent-bit-quickstart-windows.yaml
+cat ${k8sMonitoringPrefix}/cwagent/cwagent-daemonset-windows.yaml > ${OUTPUT_FLUENT_BIT_WINDOWS}
 echo -e "\n---\n" >> ${OUTPUT_FLUENT_BIT_WINDOWS}
-cat ${k8sDirPrefix}/fluent-bit/fluent-bit-windows.yaml >> ${OUTPUT_FLUENT_BIT_WINDOWS}
+cat ${k8sMonitoringPrefix}/fluent-bit/fluent-bit-windows.yaml >> ${OUTPUT_FLUENT_BIT_WINDOWS}
+
+echo "Version and manifest updates completed successfully!"
diff --git a/...wagent-ecs-instance-metric/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json b/...wagent-ecs-instance-metric/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json
@@ -105,7 +105,7 @@
         "ContainerDefinitions": [
           {
             "Name": "cloudwatch-agent",
-            "Image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123",
+            "Image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161",
             "MountPoints": [
               {
                 "ReadOnly": true,

diff --git a/...ployment-mode/daemon-service/cwagent-ecs-instance-metric/cwagent-ecs-instance-metric.json b/...ployment-mode/daemon-service/cwagent-ecs-instance-metric/cwagent-ecs-instance-metric.json
@@ -6,7 +6,7 @@
   "containerDefinitions": [
     {
       "name": "cloudwatch-agent",
-      "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123",
+      "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161",
       "mountPoints": [
         {
           "readOnly": true,

diff --git a/...wagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml b/...wagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml
@@ -224,7 +224,7 @@ Resources:
       NetworkMode: awsvpc
       ContainerDefinitions:
         - Name: cloudwatch-agent-prometheus
-          Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
+          Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161
           Essential: true
           MountPoints: []
           PortMappings: []

diff --git a/...t-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml b/...t-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml
@@ -219,7 +219,7 @@ Resources:
       NetworkMode: !Ref ECSNetworkMode
       ContainerDefinitions:
         - Name: cloudwatch-agent-prometheus
-          Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
+          Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161
           Essential: true
           MountPoints: []
           PortMappings: []

diff --git a/...eployment-mode/replica-service/cwagent-prometheus/cwagent-prometheus-task-definition.json b/...eployment-mode/replica-service/cwagent-prometheus/cwagent-prometheus-task-definition.json
@@ -6,7 +6,7 @@
   "containerDefinitions": [
     {
       "name": "cloudwatch-agent-prometheus",
-      "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123",
+      "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161",
       "essential": true,
       "mountPoints": [
       ],

diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/combination/combination-ec2.json b/ecs-task-definition-templates/deployment-mode/sidecar/combination/combination-ec2.json
@@ -22,7 +22,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/combination/combination-fargate.json b/ecs-task-definition-templates/deployment-mode/sidecar/combination/combination-fargate.json
@@ -19,7 +19,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-emf/cwagent-emf-ec2.json b/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-emf/cwagent-emf-ec2.json
@@ -22,7 +22,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-emf/cwagent-emf-fargate.json b/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-emf/cwagent-emf-fargate.json
@@ -19,7 +19,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/...finition-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-ec2.json b/...finition-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-ec2.json
@@ -22,7 +22,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/...tion-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-fargate.json b/...tion-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-fargate.json
@@ -19,7 +19,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-statsd/cwagent-statsd-ec2.json b/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-statsd/cwagent-statsd-ec2.json
@@ -27,7 +27,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/...k-definition-templates/deployment-mode/sidecar/cwagent-statsd/cwagent-statsd-fargate.json b/...k-definition-templates/deployment-mode/sidecar/cwagent-statsd/cwagent-statsd-fargate.json
@@ -24,7 +24,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/combination/combination.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/combination/combination.yaml
@@ -121,7 +121,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161
           ports:
             - containerPort: 8125
               hostPort: 8125

diff --git a/...yment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset-windows.yaml b/...yment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset-windows.yaml
@@ -20,7 +20,7 @@ spec:
       hostNetwork: true
       containers:
       - name: cloudwatch-agent
-        image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
+        image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161
         workingDir: "%CONTAINER_SANDBOX_MOUNT_POINT%\\Program Files\\Amazon\\AmazonCloudWatchAgent"
         volumeMounts:
         - name: cwagentconfig
@@ -47,7 +47,7 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           - name: CI_VERSION
-            value: "k8s/1.3.34"
+            value: "k8s/1.3.35"
           - name: CWAGENT_LOG_LEVEL
             value: DEBUG
           - name: RUN_IN_CONTAINER

diff --git a/...es/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset.yaml b/...es/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161
           #ports:
           #  - containerPort: 8125
           #    hostPort: 8125
@@ -42,7 +42,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CI_VERSION
-              value: "k8s/1.3.34"
+              value: "k8s/1.3.35"
           # Please don't change the mountPath
           volumeMounts:
             - name: cwagentconfig

diff --git a/...oyment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml b/...oyment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml
@@ -320,7 +320,7 @@ spec:
                 fieldRef:
                   fieldPath: spec.nodeName
             - name: CI_VERSION
-              value: "k8s/1.3.34"
+              value: "k8s/1.3.35"
         resources:
             limits:
               memory: 200Mi

diff --git a/...eployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-windows.yaml b/...eployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-windows.yaml
@@ -205,7 +205,7 @@ spec:
               apiVersion: v1
               fieldPath: metadata.name
         - name: CI_VERSION
-          value: "k8s/1.3.34"
+          value: "k8s/1.3.35"
         resources:
             limits:
               cpu: 500m

diff --git a/...plates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml b/...plates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml
@@ -304,7 +304,7 @@ spec:
                   apiVersion: v1
                   fieldPath: metadata.name
             - name: CI_VERSION
-              value: "k8s/1.3.34"
+              value: "k8s/1.3.35"
         resources:
             limits:
               memory: 200Mi

diff --git a/...st-templates/deployment-mode/daemonset/container-insights-monitoring/fluentd/fluentd.yaml b/...st-templates/deployment-mode/daemonset/container-insights-monitoring/fluentd/fluentd.yaml
@@ -398,7 +398,7 @@ spec:
                   name: cluster-info
                   key: cluster.name
             - name: CI_VERSION
-              value: "k8s/1.3.34"
+              value: "k8s/1.3.35"
             - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
               value: /^(?<time>.+) (?<stream>stdout|stderr) (?<logtag>[FP]) (?<log>.*)$/
           resources:

diff --git a/...nset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart-enhanced.yaml b/...nset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart-enhanced.yaml
@@ -107,7 +107,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300032.3b392
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300057.0b1161
           #ports:
           #  - containerPort: 8125
           #    hostPort: 8125
@@ -134,7 +134,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CI_VERSION
-              value: "k8s/1.3.20"
+              value: "k8s/1.3.35"
           # Please don't change the mountPath
           volumeMounts:
             - name: cwagentconfig
@@ -510,7 +510,7 @@ spec:
                   apiVersion: v1
                   fieldPath: metadata.name
             - name: CI_VERSION
-              value: "k8s/1.3.20"
+              value: "k8s/1.3.35"
         resources:
             limits:
               memory: 200Mi