diff --git a/container-insights-manifest-update.sh b/container-insights-manifest-update.sh index e427125..bbcbcf9 100755 --- a/container-insights-manifest-update.sh +++ b/container-insights-manifest-update.sh @@ -5,8 +5,8 @@ k8sDirPrefix="./k8s-deployment-manifest-templates/deployment-mode/daemonset/cont k8sQSDirPrefix="./k8s-quickstart" ecsDirPrefix="./ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric" -newK8sVersion="k8s/1.3.24" -agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300040.0b650" +newK8sVersion="k8s/1.3.25" +agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300041.0b681" fluentdVersion="fluent/fluentd-kubernetes-daemonset:v1.10.3-debian-cloudwatch-1.0" fluentBitVersion="public.ecr.aws/aws-observability/aws-for-fluent-bit:stable" 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 ce8aa58..7ea4e5a 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.300040.0b650", + "Image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300041.0b681", "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 81480b3..06c54eb 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.300040.0b650", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300041.0b681", "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 816386b..6c56066 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.300040.0b650 + Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300041.0b681 Essential: true 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 80f008b..01f3083 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.300040.0b650 + Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300041.0b681 Essential: true 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 951ded1..92a7517 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.300040.0b650", + "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300041.0b681", "essential": true, "mountPoints": [ ], 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 33d9a9f..a18ee2a 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.300040.0b650 + image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300041.0b681 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.24" + value: "k8s/1.3.25" - 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 385b75b..f997831 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.300040.0b650 + image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300041.0b681 #ports: # - containerPort: 8125 # hostPort: 8125 @@ -42,7 +42,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: CI_VERSION - value: "k8s/1.3.24" + value: "k8s/1.3.25" # 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 2dc178a..71992aa 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.24" + value: "k8s/1.3.25" 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 5fee05a..c4e3ece 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.24" + value: "k8s/1.3.25" 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 1e7a232..ef1606e 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.24" + value: "k8s/1.3.25" 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 e3ee587..06a9934 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.24" + value: "k8s/1.3.25" - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE value: /^(?