diff --git a/container-insights-manifest-update.sh b/container-insights-manifest-update.sh index 9590859..81e8790 100755 --- a/container-insights-manifest-update.sh +++ b/container-insights-manifest-update.sh @@ -3,8 +3,8 @@ cd "$(dirname "$0")" # Version definitions -newK8sVersion="k8s/1.3.37" -agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300059.0b1207" +newK8sVersion="k8s/1.3.38" +agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248" 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" diff --git a/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json b/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json index c913145..5e3556b 100644 --- a/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json +++ b/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-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.300059.0b1207", + "Image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248", "MountPoints": [ { "ReadOnly": true, diff --git a/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cwagent-ecs-instance-metric.json b/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cwagent-ecs-instance-metric.json index 639530e..48e9472 100644 --- a/ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric/cwagent-ecs-instance-metric.json +++ b/ecs-task-definition-templates/deployment-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.300059.0b1207", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248", "mountPoints": [ { "readOnly": true, diff --git a/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml b/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml index 2ced5c4..45d615a 100644 --- a/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml +++ b/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-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.300059.0b1207 + Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248 Essential: true # Set to false if you want the task to continue to run even when the agent fails MountPoints: [] PortMappings: [] diff --git a/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml b/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml index 1d85e18..b5e0672 100644 --- a/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml +++ b/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-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.300059.0b1207 + Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248 Essential: true # Set to false if you want the task to continue to run even when the agent fails MountPoints: [] PortMappings: [] diff --git a/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cwagent-prometheus-task-definition.json b/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cwagent-prometheus-task-definition.json index 2bf9bcc..b440b2e 100644 --- a/ecs-task-definition-templates/deployment-mode/replica-service/cwagent-prometheus/cwagent-prometheus-task-definition.json +++ b/ecs-task-definition-templates/deployment-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.300059.0b1207", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248", "mountPoints": [ ], "portMappings": [ 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 index 907491d..316fca5 100644 --- 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.300059.0b1207", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248", "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 index 3c8c92c..55409ad 100644 --- 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.300059.0b1207", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248", "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 index 907491d..316fca5 100644 --- 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.300059.0b1207", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248", "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 index 3c8c92c..55409ad 100644 --- 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.300059.0b1207", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248", "secrets": [ { "name": "CW_CONFIG_CONTENT", diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-ec2.json b/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-ec2.json index d4735cd..da950b6 100644 --- a/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-ec2.json +++ b/ecs-task-definition-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.300059.0b1207", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248", "secrets": [ { "name": "CW_CONFIG_CONTENT", diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-fargate.json b/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-fargate.json index 7bd4ff4..39127d8 100644 --- a/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-fargate.json +++ b/ecs-task-definition-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.300059.0b1207", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248", "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 index eb6029f..ca0aa06 100644 --- 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.300059.0b1207", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248", "secrets": [ { "name": "CW_CONFIG_CONTENT", diff --git a/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-statsd/cwagent-statsd-fargate.json b/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-statsd/cwagent-statsd-fargate.json index 2bf75d8..b0ac1f6 100644 --- a/ecs-task-definition-templates/deployment-mode/sidecar/cwagent-statsd/cwagent-statsd-fargate.json +++ b/ecs-task-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.300059.0b1207", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248", "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 index 54a6cbc..742f6f5 100644 --- 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.300059.0b1207 + image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248 ports: - containerPort: 8125 hostPort: 8125 diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset-windows.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset-windows.yaml index 3199d0a..f38726c 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset-windows.yaml +++ b/k8s-deployment-manifest-templates/deployment-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.300059.0b1207 + image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248 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.37" + value: "k8s/1.3.38" - name: CWAGENT_LOG_LEVEL value: DEBUG - name: RUN_IN_CONTAINER diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset.yaml index 2505687..d67e645 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset.yaml +++ b/k8s-deployment-manifest-templates/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.300059.0b1207 + image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300060.0b1248 #ports: # - containerPort: 8125 # hostPort: 8125 @@ -42,7 +42,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: CI_VERSION - value: "k8s/1.3.37" + value: "k8s/1.3.38" # Please don't change the mountPath volumeMounts: - name: cwagentconfig diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml index 6161fea..c725741 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml +++ b/k8s-deployment-manifest-templates/deployment-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.37" + value: "k8s/1.3.38" resources: limits: memory: 200Mi diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-windows.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-windows.yaml index f70d61f..a7f6c75 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-windows.yaml +++ b/k8s-deployment-manifest-templates/deployment-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.37" + value: "k8s/1.3.38" resources: limits: cpu: 500m diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml index 80d85bf..b72cb77 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml +++ b/k8s-deployment-manifest-templates/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.37" + value: "k8s/1.3.38" resources: limits: memory: 200Mi diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluentd/fluentd.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluentd/fluentd.yaml index 7c18476..d770e74 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/fluentd/fluentd.yaml +++ b/k8s-deployment-manifest-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.37" + value: "k8s/1.3.38" - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE value: /^(?