aws-samples · movence · May 7, 2024 · May 3, 2024
diff --git a/container-insights-manifest-update.sh b/container-insights-manifest-update.sh
@@ -2,10 +2,11 @@
 
 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.20"
-agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300036.0b573"
+newK8sVersion="k8s/1.3.22"
+agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602"
 fluentdVersion="fluent/fluentd-kubernetes-daemonset:v1.10.3-debian-cloudwatch-1.0"
 fluentBitVersion="public.ecr.aws/aws-observability/aws-for-fluent-bit:stable"
 
@@ -40,6 +41,12 @@ rm ${ecsDirPrefix}/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.jso
 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" ${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
 

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.300036.0b573",
+            "Image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602",
             "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.300036.0b573",
+      "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602",
       "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.300036.0b573
+          Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602
           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.300036.0b573
+          Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602
           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.300036.0b573",
+      "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602",
       "essential": true,
       "mountPoints": [
       ],

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.300036.0b573
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602
           #ports:
           #  - containerPort: 8125
           #    hostPort: 8125
@@ -42,7 +42,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CI_VERSION
-              value: "k8s/1.3.20"
+              value: "k8s/1.3.22"
           # 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.20"
+              value: "k8s/1.3.22"
         resources:
             limits:
               memory: 200Mi

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.20"
+              value: "k8s/1.3.22"
         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.20"
+              value: "k8s/1.3.22"
             - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
               value: /^(?<time>.+) (?<stream>stdout|stderr) (?<logtag>[FP]) (?<log>.*)$/
           resources:

diff --git a/...ode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml b/...ode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300036.0b573
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602
           #ports:
           #  - containerPort: 8125
           #    hostPort: 8125
@@ -127,7 +127,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CI_VERSION
-              value: "k8s/1.3.20"
+              value: "k8s/1.3.22"
           # Please don't change the mountPath
           volumeMounts:
             - name: cwagentconfig
@@ -503,7 +503,7 @@ spec:
                   apiVersion: v1
                   fieldPath: metadata.name
             - name: CI_VERSION
-              value: "k8s/1.3.20"
+              value: "k8s/1.3.22"
         resources:
             limits:
               memory: 200Mi

diff --git a/...t-mode/daemonset/container-insights-monitoring/quickstart/cwagent-fluentd-quickstart.yaml b/...t-mode/daemonset/container-insights-monitoring/quickstart/cwagent-fluentd-quickstart.yaml
@@ -100,7 +100,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300036.0b573
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602
           #ports:
           #  - containerPort: 8125
           #    hostPort: 8125
@@ -127,7 +127,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CI_VERSION
-              value: "k8s/1.3.20"
+              value: "k8s/1.3.22"
           # Please don't change the mountPath
           volumeMounts:
             - name: cwagentconfig
@@ -591,7 +591,7 @@ spec:
                   name: cluster-info
                   key: cluster.name
             - name: CI_VERSION
-              value: "k8s/1.3.20"
+              value: "k8s/1.3.22"
             - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
               value: /^(?<time>.+) (?<stream>stdout|stderr) (?<logtag>[FP]) (?<log>.*)$/
           resources:

diff --git a/...manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks-fargate.yaml b/...manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks-fargate.yaml
@@ -398,7 +398,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300036.0b573
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602
           imagePullPolicy: Always
           resources:
             limits:
@@ -410,7 +410,7 @@ spec:
           # Please don't change below envs
           env:
             - name: CI_VERSION
-              value: "k8s/1.3.20"
+              value: "k8s/1.3.22"
             - name: RUN_IN_AWS
               value: "True"
           # Please don't change the mountPath

diff --git a/...loyment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks.yaml b/...loyment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks.yaml
@@ -449,7 +449,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300036.0b573
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602
           imagePullPolicy: Always
           resources:
             limits:
@@ -461,7 +461,7 @@ spec:
           # Please don't change below envs
           env:
             - name: CI_VERSION
-              value: "k8s/1.3.20"
+              value: "k8s/1.3.22"
           # Please don't change the mountPath
           volumeMounts:
             - name: prometheus-cwagentconfig

diff --git a/...loyment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-k8s.yaml b/...loyment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-k8s.yaml
@@ -396,7 +396,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300036.0b573
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602
           imagePullPolicy: Always
           resources:
             limits:
@@ -408,7 +408,7 @@ spec:
           # Please don't change below envs
           env:
             - name: CI_VERSION
-              value: "k8s/1.3.20"
+              value: "k8s/1.3.22"
           # Please don't change the mountPath
           volumeMounts:
             - name: prometheus-cwagentconfig

diff --git a/k8s-quickstart/cwagent-operator-rendered.yaml b/k8s-quickstart/cwagent-operator-rendered.yaml
@@ -649,7 +649,7 @@ spec:
               apiVersion: v1
               fieldPath: metadata.name
         - name: CI_VERSION
-          value: "k8s/1.3.17"
+          value: "k8s/1.3.22"
         resources:
           limits:
             cpu: 500m
@@ -754,7 +754,7 @@ spec:
               apiVersion: v1
               fieldPath: metadata.name
         - name: CI_VERSION
-          value: "k8s/1.3.17"
+          value: "k8s/1.3.22"
         resources:
           limits:
             cpu: 500m
@@ -839,7 +839,7 @@ metadata:
   name: cloudwatch-agent
   namespace: amazon-cloudwatch
 spec:
-  image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.0b583
+  image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602
   mode: daemonset
   nodeSelector:
     kubernetes.io/os: linux
@@ -934,7 +934,7 @@ spec:
       hostProcess: true
       runAsUserName: "NT AUTHORITY\\System"
   hostNetwork: true
-  image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.0b583
+  image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602
   mode: daemonset
   serviceAccount: cloudwatch-agent
   nodeSelector:

diff --git a/k8s-quickstart/cwagent-version.yaml b/k8s-quickstart/cwagent-version.yaml
@@ -4,7 +4,7 @@ metadata:
   name: cloudwatch-agent
   namespace: amazon-cloudwatch
 spec:
-  image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.0b583
+  image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300037.1b602
   mode: daemonset
   nodeSelector:
     kubernetes.io/os: linux