Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed .container-insights-manifest-update.sh.swp
Binary file not shown.
4 changes: 2 additions & 2 deletions container-insights-manifest-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.33"
agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074"
newK8sVersion="k8s/1.3.34"
agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123"
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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"ContainerDefinitions": [
{
"Name": "cloudwatch-agent",
"Image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074",
"Image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123",
"MountPoints": [
{
"ReadOnly": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"containerDefinitions": [
{
"name": "cloudwatch-agent",
"image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074",
"image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123",
"mountPoints": [
{
"readOnly": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ Resources:
NetworkMode: awsvpc
ContainerDefinitions:
- Name: cloudwatch-agent-prometheus
Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
Essential: true
MountPoints: []
PortMappings: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ Resources:
NetworkMode: !Ref ECSNetworkMode
ContainerDefinitions:
- Name: cloudwatch-agent-prometheus
Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
Essential: true
MountPoints: []
PortMappings: []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"containerDefinitions": [
{
"name": "cloudwatch-agent-prometheus",
"image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074",
"image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123",
"essential": true,
"mountPoints": [
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
hostNetwork: true
containers:
- name: cloudwatch-agent
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
workingDir: "%CONTAINER_SANDBOX_MOUNT_POINT%\\Program Files\\Amazon\\AmazonCloudWatchAgent"
volumeMounts:
- name: cwagentconfig
Expand All @@ -47,7 +47,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
- name: CWAGENT_LOG_LEVEL
value: DEBUG
- name: RUN_IN_CONTAINER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
spec:
containers:
- name: cloudwatch-agent
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
#ports:
# - containerPort: 8125
# hostPort: 8125
Expand All @@ -42,7 +42,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
# Please don't change the mountPath
volumeMounts:
- name: cwagentconfig
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ spec:
fieldRef:
fieldPath: spec.nodeName
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
resources:
limits:
memory: 200Mi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ spec:
apiVersion: v1
fieldPath: metadata.name
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
resources:
limits:
cpu: 500m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ spec:
apiVersion: v1
fieldPath: metadata.name
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
resources:
limits:
memory: 200Mi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ spec:
name: cluster-info
key: cluster.name
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
- name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
value: /^(?<time>.+) (?<stream>stdout|stderr) (?<logtag>[FP]) (?<log>.*)$/
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
hostNetwork: true
containers:
- name: cloudwatch-agent
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
workingDir: "%CONTAINER_SANDBOX_MOUNT_POINT%\\Program Files\\Amazon\\AmazonCloudWatchAgent"
volumeMounts:
- name: cwagentconfig
Expand All @@ -47,7 +47,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
- name: CWAGENT_LOG_LEVEL
value: DEBUG
- name: RUN_IN_CONTAINER
Expand Down Expand Up @@ -271,7 +271,7 @@ spec:
apiVersion: v1
fieldPath: metadata.name
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
resources:
limits:
cpu: 500m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
spec:
containers:
- name: cloudwatch-agent
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
#ports:
# - containerPort: 8125
# hostPort: 8125
Expand All @@ -133,7 +133,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
# Please don't change the mountPath
volumeMounts:
- name: cwagentconfig
Expand Down Expand Up @@ -509,7 +509,7 @@ spec:
apiVersion: v1
fieldPath: metadata.name
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
resources:
limits:
memory: 200Mi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ spec:
spec:
containers:
- name: cloudwatch-agent
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
#ports:
# - containerPort: 8125
# hostPort: 8125
Expand All @@ -133,7 +133,7 @@ spec:
fieldRef:
fieldPath: metadata.namespace
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
# Please don't change the mountPath
volumeMounts:
- name: cwagentconfig
Expand Down Expand Up @@ -597,7 +597,7 @@ spec:
name: cluster-info
key: cluster.name
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
- name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
value: /^(?<time>.+) (?<stream>stdout|stderr) (?<logtag>[FP]) (?<log>.*)$/
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ spec:
spec:
containers:
- name: cloudwatch-agent
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
imagePullPolicy: Always
resources:
limits:
Expand All @@ -410,7 +410,7 @@ spec:
# Please don't change below envs
env:
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
- name: RUN_IN_AWS
value: "True"
# Please don't change the mountPath
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ spec:
spec:
containers:
- name: cloudwatch-agent
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
imagePullPolicy: Always
resources:
limits:
Expand All @@ -157,7 +157,7 @@ spec:
# Please don't change below envs
env:
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
# Please don't change the mountPath
volumeMounts:
- name: prometheus-cwagentconfig
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ spec:
spec:
containers:
- name: cloudwatch-agent
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
imagePullPolicy: Always
resources:
limits:
Expand All @@ -461,7 +461,7 @@ spec:
# Please don't change below envs
env:
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
# Please don't change the mountPath
volumeMounts:
- name: prometheus-cwagentconfig
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ spec:
spec:
containers:
- name: cloudwatch-agent
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
imagePullPolicy: Always
resources:
limits:
Expand All @@ -408,7 +408,7 @@ spec:
# Please don't change below envs
env:
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
# Please don't change the mountPath
volumeMounts:
- name: prometheus-cwagentconfig
Expand Down
8 changes: 4 additions & 4 deletions k8s-quickstart/cwagent-operator-rendered.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@ spec:
apiVersion: v1
fieldPath: metadata.name
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
resources:
limits:
cpu: 500m
Expand Down Expand Up @@ -757,7 +757,7 @@ spec:
apiVersion: v1
fieldPath: metadata.name
- name: CI_VERSION
value: "k8s/1.3.33"
value: "k8s/1.3.34"
resources:
limits:
cpu: 500m
Expand Down Expand Up @@ -842,7 +842,7 @@ metadata:
name: cloudwatch-agent
namespace: amazon-cloudwatch
spec:
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
mode: daemonset
nodeSelector:
kubernetes.io/os: linux
Expand Down Expand Up @@ -937,7 +937,7 @@ spec:
hostProcess: true
runAsUserName: "NT AUTHORITY\\System"
hostNetwork: true
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
mode: daemonset
serviceAccount: cloudwatch-agent
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion k8s-quickstart/cwagent-version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: cloudwatch-agent
namespace: amazon-cloudwatch
spec:
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300054.0b1074
image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300056.0b1123
mode: daemonset
nodeSelector:
kubernetes.io/os: linux
Expand Down