From f40b16a441a00e98e2713c4095cf135aafecdd34 Mon Sep 17 00:00:00 2001 From: haojh <haojh@amazon.com> Date: Thu, 24 Jun 2021 11:38:38 -0700 Subject: [PATCH] Release 1.3.7 --- CHANGELOG.md | 3 +++ container-insights-manifest-update.sh | 4 ++-- .../cwagent-ecs-instance-metric-cfn.json | 2 +- .../cwagent-ecs-instance-metric.json | 2 +- .../cwagent-ecs-prometheus-metric-for-awsvpc.yaml | 2 +- .../cwagent-ecs-prometheus-metric-for-bridge-host.yaml | 2 +- .../cwagent-prometheus-task-definition.json | 2 +- .../cwagent/cwagent-daemonset.yaml | 4 ++-- .../fluent-bit/fluent-bit-compatible.yaml | 2 +- .../fluent-bit/fluent-bit.yaml | 2 +- .../container-insights-monitoring/fluentd/fluentd.yaml | 2 +- .../quickstart/cwagent-fluent-bit-quickstart.yaml | 6 +++--- .../quickstart/cwagent-fluentd-quickstart.yaml | 6 +++--- .../service/cwagent-prometheus/prometheus-eks-fargate.yaml | 4 ++-- .../service/cwagent-prometheus/prometheus-eks.yaml | 4 ++-- .../service/cwagent-prometheus/prometheus-k8s.yaml | 4 ++-- 16 files changed, 27 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbc3575..3bf43ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## k8s/1.3.7 +- Upgrade cloduwatch-agent image version to cloudwatch-agent:1.247348.0b251302 +- Remove logging all the metrics introduced in #193 [commit](https://github.com/aws/amazon-cloudwatch-agent/commit/2067daa44eab56fb28223861a710bb45283c8f8e) ## k8s/1.3.6 - Upgrade cloduwatch-agent image version to cloudwatch-agent:1.247347.6b250880 - Fix container insight pod metric missing when using containerd runtime diff --git a/container-insights-manifest-update.sh b/container-insights-manifest-update.sh index 1d40360..d590d8d 100755 --- a/container-insights-manifest-update.sh +++ b/container-insights-manifest-update.sh @@ -4,8 +4,8 @@ cd "$(dirname "$0")" k8sDirPrefix="./k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring" ecsDirPrefix="./ecs-task-definition-templates/deployment-mode/daemon-service/cwagent-ecs-instance-metric" -newK8sVersion="k8s/1.3.6" -agentVersion="amazon/cloudwatch-agent:1.247347.6b250880" +newK8sVersion="k8s/1.3.7" +agentVersion="amazon/cloudwatch-agent:1.247348.0b251302" fluentdVersion="fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0" fluentBitVersion="amazon/aws-for-fluent-bit:2.10.0" 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 74d5eed..d5396b3 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": "amazon/cloudwatch-agent:1.247347.6b250880", + "Image": "amazon/cloudwatch-agent:1.247348.0b251302", "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 183eb42..21145a9 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": "amazon/cloudwatch-agent:1.247347.6b250880", + "image": "amazon/cloudwatch-agent:1.247348.0b251302", "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 6d9c839..928cf90 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: amazon/cloudwatch-agent:1.247347.6b250880 + Image: amazon/cloudwatch-agent:1.247348.0b251302 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 eac8176..44a3e1c 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: amazon/cloudwatch-agent:1.247347.6b250880 + Image: amazon/cloudwatch-agent:1.247348.0b251302 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 e881b41..560f699 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": "amazon/cloudwatch-agent:1.247347.6b250880", + "image": "amazon/cloudwatch-agent:1.247348.0b251302", "essential": true, "mountPoints": [ ], 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 c4397bf..e810dde 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: amazon/cloudwatch-agent:1.247347.6b250880 + image: amazon/cloudwatch-agent:1.247348.0b251302 #ports: # - containerPort: 8125 # hostPort: 8125 @@ -42,7 +42,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: CI_VERSION - value: "k8s/1.3.6" + value: "k8s/1.3.7" # 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 55389ac..26be0ce 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 @@ -318,7 +318,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: CI_VERSION - value: "k8s/1.3.6" + value: "k8s/1.3.7" resources: limits: memory: 200Mi 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 275f3f0..db77b3c 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 @@ -307,7 +307,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: CI_VERSION - value: "k8s/1.3.6" + value: "k8s/1.3.7" 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 c4d8d92..38fe948 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 @@ -391,7 +391,7 @@ spec: name: cluster-info key: cluster.name - name: CI_VERSION - value: "k8s/1.3.6" + value: "k8s/1.3.7" resources: limits: memory: 400Mi diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml index 92c8b3f..26032ef 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml @@ -98,7 +98,7 @@ spec: spec: containers: - name: cloudwatch-agent - image: amazon/cloudwatch-agent:1.247347.6b250880 + image: amazon/cloudwatch-agent:1.247348.0b251302 #ports: # - containerPort: 8125 # hostPort: 8125 @@ -125,7 +125,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: CI_VERSION - value: "k8s/1.3.6" + value: "k8s/1.3.7" # Please don't change the mountPath volumeMounts: - name: cwagentconfig @@ -502,7 +502,7 @@ spec: fieldRef: fieldPath: spec.nodeName - name: CI_VERSION - value: "k8s/1.3.6" + value: "k8s/1.3.7" resources: limits: memory: 200Mi diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/quickstart/cwagent-fluentd-quickstart.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/quickstart/cwagent-fluentd-quickstart.yaml index 3641f4f..af33f25 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/quickstart/cwagent-fluentd-quickstart.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/daemonset/container-insights-monitoring/quickstart/cwagent-fluentd-quickstart.yaml @@ -98,7 +98,7 @@ spec: spec: containers: - name: cloudwatch-agent - image: amazon/cloudwatch-agent:1.247347.6b250880 + image: amazon/cloudwatch-agent:1.247348.0b251302 #ports: # - containerPort: 8125 # hostPort: 8125 @@ -125,7 +125,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: CI_VERSION - value: "k8s/1.3.6" + value: "k8s/1.3.7" # Please don't change the mountPath volumeMounts: - name: cwagentconfig @@ -580,7 +580,7 @@ spec: name: cluster-info key: cluster.name - name: CI_VERSION - value: "k8s/1.3.6" + value: "k8s/1.3.7" resources: limits: memory: 400Mi diff --git a/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks-fargate.yaml b/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks-fargate.yaml index 0200c57..78d4a91 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks-fargate.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks-fargate.yaml @@ -398,7 +398,7 @@ spec: spec: containers: - name: cloudwatch-agent - image: amazon/cloudwatch-agent:1.247347.6b250880 + image: amazon/cloudwatch-agent:1.247348.0b251302 imagePullPolicy: Always resources: limits: @@ -410,7 +410,7 @@ spec: # Please don't change below envs env: - name: CI_VERSION - value: "k8s/1.3.6" + value: "k8s/1.3.7" - name: RUN_IN_AWS value: "True" # Please don't change the mountPath diff --git a/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks.yaml b/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks.yaml index 716751b..1657857 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-eks.yaml @@ -449,7 +449,7 @@ spec: spec: containers: - name: cloudwatch-agent - image: amazon/cloudwatch-agent:1.247347.6b250880 + image: amazon/cloudwatch-agent:1.247348.0b251302 imagePullPolicy: Always resources: limits: @@ -461,7 +461,7 @@ spec: # Please don't change below envs env: - name: CI_VERSION - value: "k8s/1.3.6" + value: "k8s/1.3.7" # Please don't change the mountPath volumeMounts: - name: prometheus-cwagentconfig diff --git a/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-k8s.yaml b/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-k8s.yaml index d638a54..beb1218 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-k8s.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/service/cwagent-prometheus/prometheus-k8s.yaml @@ -396,7 +396,7 @@ spec: spec: containers: - name: cloudwatch-agent - image: amazon/cloudwatch-agent:1.247347.6b250880 + image: amazon/cloudwatch-agent:1.247348.0b251302 imagePullPolicy: Always resources: limits: @@ -408,7 +408,7 @@ spec: # Please don't change below envs env: - name: CI_VERSION - value: "k8s/1.3.6" + value: "k8s/1.3.7" # Please don't change the mountPath volumeMounts: - name: prometheus-cwagentconfig