From 9a90e7248ad26ed280a89442337bd593178f5231 Mon Sep 17 00:00:00 2001 From: Hugo Prudente Date: Tue, 10 Mar 2020 22:05:13 +0000 Subject: [PATCH 1/2] Upgrading fluentd version + cloudwatch-agent --- CHANGELOG.md | 4 ++++ .../cwagent-ecs-instance-metric-cfn.json | 2 +- .../cwagent-ecs-instance-metric.json | 2 +- .../deployment-mode/daemonset/combination/combination.yaml | 2 +- .../cwagent/cwagent-daemonset.yaml | 2 +- .../container-insights-monitoring/fluentd/fluentd.yaml | 2 +- .../quickstart/cwagent-fluentd-quickstart.yaml | 4 ++-- .../cwagent-fluentd-xray/cwagent-fluentd-xray-quickstart.yaml | 2 +- .../cwagent-kubernetes-monitoring/cwagent-daemonset.yaml | 2 +- k8s-yaml-templates/fluentd/fluentd.yaml | 2 +- k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml | 4 ++-- 11 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0f25a0..dabdf7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## k8s/1.1.1 / ECS/1.1.1 +- Upgrade cloudwatch-agent image version to latest, matching all other configurations. +- Upgrade fluentd image vesrion to v1.9.2-debian-cloudwatch-1.0 + ## k8s/1.1.0 - Upgrade cloudwatch-agent image version to 1.231221.0 - Support some other features like AWS SDK Metrics, EMF, etc 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 d996892..8100f4b 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.231221.0", + "Image": "amazon/cloudwatch-agent:latest", "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 e0b9fa8..147c508 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.231221.0", + "image": "amazon/cloudwatch-agent:latest", "mountPoints": [ { "readOnly": true, 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 0d598cd..8693b62 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/combination/combination.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/daemonset/combination/combination.yaml @@ -580,7 +580,7 @@ spec: command: ['sh','-c',''] containers: - name: fluentd-cloudwatch - image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0 + image: fluent/fluentd-kubernetes-daemonset:v1.9.2-debian-cloudwatch-1.0 env: - name: REGION valueFrom: 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 f709cf4..f8ae07e 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.231221.0 + image: amazon/cloudwatch-agent:latest #ports: # - containerPort: 8125 # hostPort: 8125 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 1feb98d..95ba13f 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 @@ -378,7 +378,7 @@ spec: command: ['sh','-c',''] containers: - name: fluentd-cloudwatch - image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0 + image: fluent/fluentd-kubernetes-daemonset:v1.9.2-debian-cloudwatch-1.0 env: - name: REGION valueFrom: 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 736b51c..86514e8 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 @@ -99,7 +99,7 @@ spec: spec: containers: - name: cloudwatch-agent - image: amazon/cloudwatch-agent:1.231221.0 + image: amazon/cloudwatch-agent:latest #ports: # - containerPort: 8125 # hostPort: 8125 @@ -562,7 +562,7 @@ spec: command: ['sh','-c',''] containers: - name: fluentd-cloudwatch - image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0 + image: fluent/fluentd-kubernetes-daemonset:v1.9.2-debian-cloudwatch-1.0 env: - name: REGION valueFrom: diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/cwagent-fluentd-xray/cwagent-fluentd-xray-quickstart.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/cwagent-fluentd-xray/cwagent-fluentd-xray-quickstart.yaml index 9349010..ece5531 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/cwagent-fluentd-xray/cwagent-fluentd-xray-quickstart.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/daemonset/cwagent-fluentd-xray/cwagent-fluentd-xray-quickstart.yaml @@ -471,7 +471,7 @@ spec: command: ['sh','-c',''] containers: - name: fluentd-cloudwatch - image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0 + image: fluent/fluentd-kubernetes-daemonset:v1.9.2-debian-cloudwatch-1.0 env: - name: REGION valueFrom: diff --git a/k8s-yaml-templates/cwagent-kubernetes-monitoring/cwagent-daemonset.yaml b/k8s-yaml-templates/cwagent-kubernetes-monitoring/cwagent-daemonset.yaml index 8685edc..1a8a9c8 100644 --- a/k8s-yaml-templates/cwagent-kubernetes-monitoring/cwagent-daemonset.yaml +++ b/k8s-yaml-templates/cwagent-kubernetes-monitoring/cwagent-daemonset.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: cloudwatch-agent - image: amazon/cloudwatch-agent:1.230621.0 + image: amazon/cloudwatch-agent:latest #ports: # - containerPort: 8125 # hostPort: 8125 diff --git a/k8s-yaml-templates/fluentd/fluentd.yaml b/k8s-yaml-templates/fluentd/fluentd.yaml index 44ef6e1..11c8ba4 100644 --- a/k8s-yaml-templates/fluentd/fluentd.yaml +++ b/k8s-yaml-templates/fluentd/fluentd.yaml @@ -378,7 +378,7 @@ spec: command: ['sh','-c',''] containers: - name: fluentd-cloudwatch - image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0 + image: fluent/fluentd-kubernetes-daemonset:v1.9.2-debian-cloudwatch-1.0 env: - name: REGION valueFrom: diff --git a/k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml b/k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml index 3cb62a9..0190681 100644 --- a/k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml +++ b/k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml @@ -99,7 +99,7 @@ spec: spec: containers: - name: cloudwatch-agent - image: amazon/cloudwatch-agent:1.230621.0 + image: amazon/cloudwatch-agent:latest #ports: # - containerPort: 8125 # hostPort: 8125 @@ -562,7 +562,7 @@ spec: command: ['sh','-c',''] containers: - name: fluentd-cloudwatch - image: fluent/fluentd-kubernetes-daemonset:v1.7.3-debian-cloudwatch-1.0 + image: fluent/fluentd-kubernetes-daemonset:v1.9.2-debian-cloudwatch-1.0 env: - name: REGION valueFrom: From 7491597893eaf9403526664a5357fc946998ee3f Mon Sep 17 00:00:00 2001 From: Hugo Prudente Date: Mon, 23 Mar 2020 19:24:47 +0000 Subject: [PATCH 2/2] Bumping version of debian to 1.9.3 cloudwatch 1.0 for fluent/fluentd-kubernetes-daemonset --- CHANGELOG.md | 3 +++ .../deployment-mode/daemonset/combination/combination.yaml | 2 +- .../container-insights-monitoring/fluentd/fluentd.yaml | 2 +- .../quickstart/cwagent-fluentd-quickstart.yaml | 2 +- .../cwagent-fluentd-xray/cwagent-fluentd-xray-quickstart.yaml | 2 +- k8s-yaml-templates/fluentd/fluentd.yaml | 2 +- k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dabdf7d..22cc716 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## k8s/1.1.2 / ECS/1.1.2 +- Upgrade fluentd image version to v1.9.3-debian-cloudwatch-1.0 + ## k8s/1.1.1 / ECS/1.1.1 - Upgrade cloudwatch-agent image version to latest, matching all other configurations. - Upgrade fluentd image vesrion to v1.9.2-debian-cloudwatch-1.0 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 8693b62..074945c 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/combination/combination.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/daemonset/combination/combination.yaml @@ -580,7 +580,7 @@ spec: command: ['sh','-c',''] containers: - name: fluentd-cloudwatch - image: fluent/fluentd-kubernetes-daemonset:v1.9.2-debian-cloudwatch-1.0 + image: fluent/fluentd-kubernetes-daemonset:v1.9.3-debian-cloudwatch-1.0 env: - name: REGION valueFrom: 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 95ba13f..03ca3c4 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 @@ -378,7 +378,7 @@ spec: command: ['sh','-c',''] containers: - name: fluentd-cloudwatch - image: fluent/fluentd-kubernetes-daemonset:v1.9.2-debian-cloudwatch-1.0 + image: fluent/fluentd-kubernetes-daemonset:v1.9.3-debian-cloudwatch-1.0 env: - name: REGION valueFrom: 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 86514e8..6d71ec0 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 @@ -562,7 +562,7 @@ spec: command: ['sh','-c',''] containers: - name: fluentd-cloudwatch - image: fluent/fluentd-kubernetes-daemonset:v1.9.2-debian-cloudwatch-1.0 + image: fluent/fluentd-kubernetes-daemonset:v1.9.3-debian-cloudwatch-1.0 env: - name: REGION valueFrom: diff --git a/k8s-deployment-manifest-templates/deployment-mode/daemonset/cwagent-fluentd-xray/cwagent-fluentd-xray-quickstart.yaml b/k8s-deployment-manifest-templates/deployment-mode/daemonset/cwagent-fluentd-xray/cwagent-fluentd-xray-quickstart.yaml index ece5531..d7dae77 100644 --- a/k8s-deployment-manifest-templates/deployment-mode/daemonset/cwagent-fluentd-xray/cwagent-fluentd-xray-quickstart.yaml +++ b/k8s-deployment-manifest-templates/deployment-mode/daemonset/cwagent-fluentd-xray/cwagent-fluentd-xray-quickstart.yaml @@ -471,7 +471,7 @@ spec: command: ['sh','-c',''] containers: - name: fluentd-cloudwatch - image: fluent/fluentd-kubernetes-daemonset:v1.9.2-debian-cloudwatch-1.0 + image: fluent/fluentd-kubernetes-daemonset:v1.9.3-debian-cloudwatch-1.0 env: - name: REGION valueFrom: diff --git a/k8s-yaml-templates/fluentd/fluentd.yaml b/k8s-yaml-templates/fluentd/fluentd.yaml index 11c8ba4..7536226 100644 --- a/k8s-yaml-templates/fluentd/fluentd.yaml +++ b/k8s-yaml-templates/fluentd/fluentd.yaml @@ -378,7 +378,7 @@ spec: command: ['sh','-c',''] containers: - name: fluentd-cloudwatch - image: fluent/fluentd-kubernetes-daemonset:v1.9.2-debian-cloudwatch-1.0 + image: fluent/fluentd-kubernetes-daemonset:v1.9.3-debian-cloudwatch-1.0 env: - name: REGION valueFrom: diff --git a/k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml b/k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml index 0190681..8246c78 100644 --- a/k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml +++ b/k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml @@ -562,7 +562,7 @@ spec: command: ['sh','-c',''] containers: - name: fluentd-cloudwatch - image: fluent/fluentd-kubernetes-daemonset:v1.9.2-debian-cloudwatch-1.0 + image: fluent/fluentd-kubernetes-daemonset:v1.9.3-debian-cloudwatch-1.0 env: - name: REGION valueFrom: