updates for enhanced container insights (#148)

aws-samples · Oct 3, 2023 · 2eeceba · 2eeceba
1 parent a9d75d1
commit 2eeceba
Show file tree

Hide file tree

Showing 42 changed files with 102 additions and 84 deletions.
diff --git 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.16"
-agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247360.0b252689"
+newK8sVersion="k8s/1.3.17"
+agentVersion="public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210"
 fluentdVersion="fluent/fluentd-kubernetes-daemonset:v1.10.3-debian-cloudwatch-1.0"
 fluentBitVersion="public.ecr.aws/aws-observability/aws-for-fluent-bit:stable"
 

diff --git a/...wagent-ecs-instance-metric/cloudformation-quickstart/cwagent-ecs-instance-metric-cfn.json b/...wagent-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.247360.0b252689",
+            "Image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210",
             "MountPoints": [
               {
                 "ReadOnly": true,

diff --git a/...ployment-mode/daemon-service/cwagent-ecs-instance-metric/cwagent-ecs-instance-metric.json b/...ployment-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.247360.0b252689",
+      "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210",
       "mountPoints": [
         {
           "readOnly": true,

diff --git a/...wagent-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-awsvpc.yaml b/...wagent-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.247360.0b252689
+          Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210
           Essential: true
           MountPoints: []
           PortMappings: []

diff --git a/...t-prometheus/cloudformation-quickstart/cwagent-ecs-prometheus-metric-for-bridge-host.yaml b/...t-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.247360.0b252689
+          Image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210
           Essential: true
           MountPoints: []
           PortMappings: []

diff --git a/...eployment-mode/replica-service/cwagent-prometheus/cwagent-prometheus-task-definition.json b/...eployment-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.247360.0b252689",
+      "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210",
       "essential": true,
       "mountPoints": [
       ],

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
@@ -22,7 +22,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:latest",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210",
             "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
@@ -19,7 +19,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:latest",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210",
             "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
@@ -22,7 +22,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:latest",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210",
             "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
@@ -19,7 +19,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:latest",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/...finition-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-ec2.json b/...finition-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:latest",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/...tion-templates/deployment-mode/sidecar/cwagent-sdkmetrics/cwagent-sdkmetrics-fargate.json b/...tion-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:latest",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210",
             "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
@@ -27,7 +27,7 @@
         },
         {
             "name": "cloudwatch-agent",
-            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:latest",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210",
             "secrets": [
                 {
                     "name": "CW_CONFIG_CONTENT",

diff --git a/...k-definition-templates/deployment-mode/sidecar/cwagent-statsd/cwagent-statsd-fargate.json b/...k-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:latest",
+            "image": "public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210",
             "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
@@ -24,7 +24,7 @@ rules:
     resources: ["pods", "nodes", "endpoints"]
     verbs: ["list", "watch"]
   - apiGroups: ["apps"]
-    resources: ["replicasets"]
+    resources: ["replicasets", "daemonsets", "deployments"]
     verbs: ["list", "watch"]
   - apiGroups: ["batch"]
     resources: ["jobs"]
@@ -39,6 +39,8 @@ rules:
     resources: ["configmaps"]
     resourceNames: ["cwagent-clusterleader"]
     verbs: ["get","update"]
+  - nonResourceURLs: ["/metrics"]
+    verbs: ["get", "list", "watch"]
 
 ---
 kind: ClusterRoleBinding
@@ -71,7 +73,8 @@ data:
         "metrics_collected": {
           "kubernetes": {
             "cluster_name": "{{cluster_name}}",
-            "metrics_collection_interval": 60
+            "metrics_collection_interval": 60,
+            "enhanced_container_insights": true
           },
           "emf": {}
         },
@@ -113,7 +116,7 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:latest
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210
           ports:
             - containerPort: 8125
               hostPort: 8125
@@ -126,11 +129,11 @@ spec:
               protocol: UDP
           resources:
             limits:
-              cpu:  200m
-              memory: 200Mi
+              cpu:  400m
+              memory: 400Mi
             requests:
-              cpu: 200m
-              memory: 200Mi
+              cpu: 400m
+              memory: 400Mi
           # Please don't change below envs
           env:
             - name: HOST_IP

diff --git a/...es/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-configmap.yaml b/...es/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-configmap.yaml
@@ -9,7 +9,8 @@ data:
         "metrics_collected": {
           "kubernetes": {
             "cluster_name": "{{cluster_name}}",
-            "metrics_collection_interval": 60
+            "metrics_collection_interval": 60,
+            "enhanced_container_insights": true
           }
         },
         "force_flush_interval": 5

diff --git a/...es/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset.yaml b/...es/deployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-daemonset.yaml
@@ -15,18 +15,18 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247360.0b252689
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210
           #ports:
           #  - containerPort: 8125
           #    hostPort: 8125
           #    protocol: UDP
           resources:
             limits:
-              cpu:  200m
-              memory: 200Mi
+              cpu:  400m
+              memory: 400Mi
             requests:
-              cpu: 200m
-              memory: 200Mi
+              cpu: 400m
+              memory: 400Mi
           # Please don't change below envs
           env:
             - name: HOST_IP
@@ -42,7 +42,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CI_VERSION
-              value: "k8s/1.3.16"
+              value: "k8s/1.3.17"
           # Please don't change the mountPath
           volumeMounts:
             - name: cwagentconfig

diff --git a/...ployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-serviceaccount.yaml b/...ployment-mode/daemonset/container-insights-monitoring/cwagent/cwagent-serviceaccount.yaml
@@ -15,7 +15,7 @@ rules:
     resources: ["pods", "nodes", "endpoints"]
     verbs: ["list", "watch"]
   - apiGroups: ["apps"]
-    resources: ["replicasets"]
+    resources: ["replicasets", "daemonsets", "deployments"]
     verbs: ["list", "watch"]
   - apiGroups: ["batch"]
     resources: ["jobs"]
@@ -30,6 +30,8 @@ rules:
     resources: ["configmaps"]
     resourceNames: ["cwagent-clusterleader"]
     verbs: ["get","update"]
+  - nonResourceURLs: ["/metrics"]
+    verbs: ["get", "list", "watch"]
 
 ---
 kind: ClusterRoleBinding

diff --git a/...oyment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit-compatible.yaml b/...oyment-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.16"
+              value: "k8s/1.3.17"
         resources:
             limits:
               memory: 200Mi

diff --git a/...plates/deployment-mode/daemonset/container-insights-monitoring/fluent-bit/fluent-bit.yaml b/...plates/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.16"
+              value: "k8s/1.3.17"
         resources:
             limits:
               memory: 200Mi

diff --git a/...st-templates/deployment-mode/daemonset/container-insights-monitoring/fluentd/fluentd.yaml b/...st-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.16"
+              value: "k8s/1.3.17"
             - name: FLUENT_CONTAINER_TAIL_PARSER_TYPE
               value: /^(?<time>.+) (?<stream>stdout|stderr) (?<logtag>[FP]) (?<log>.*)$/
           resources:

diff --git a/...ode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml b/...ode/daemonset/container-insights-monitoring/quickstart/cwagent-fluent-bit-quickstart.yaml
@@ -24,7 +24,7 @@ rules:
     resources: ["pods", "nodes", "endpoints"]
     verbs: ["list", "watch"]
   - apiGroups: ["apps"]
-    resources: ["replicasets"]
+    resources: ["replicasets", "daemonsets", "deployments"]
     verbs: ["list", "watch"]
   - apiGroups: ["batch"]
     resources: ["jobs"]
@@ -39,6 +39,8 @@ rules:
     resources: ["configmaps"]
     resourceNames: ["cwagent-clusterleader"]
     verbs: ["get","update"]
+  - nonResourceURLs: ["/metrics"]
+    verbs: ["get", "list", "watch"]
 
 ---
 kind: ClusterRoleBinding
@@ -69,7 +71,8 @@ data:
         "metrics_collected": {
           "kubernetes": {
             "cluster_name": "{{cluster_name}}",
-            "metrics_collection_interval": 60
+            "metrics_collection_interval": 60,
+            "enhanced_container_insights": true
           }
         },
         "force_flush_interval": 5
@@ -98,18 +101,18 @@ spec:
     spec:
       containers:
         - name: cloudwatch-agent
-          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.247360.0b252689
+          image: public.ecr.aws/cloudwatch-agent/cloudwatch-agent:1.300028.1b210
           #ports:
           #  - containerPort: 8125
           #    hostPort: 8125
           #    protocol: UDP
           resources:
             limits:
-              cpu:  200m
-              memory: 200Mi
+              cpu:  400m
+              memory: 400Mi
             requests:
-              cpu: 200m
-              memory: 200Mi
+              cpu: 400m
+              memory: 400Mi
           # Please don't change below envs
           env:
             - name: HOST_IP
@@ -125,7 +128,7 @@ spec:
                 fieldRef:
                   fieldPath: metadata.namespace
             - name: CI_VERSION
-              value: "k8s/1.3.16"
+              value: "k8s/1.3.17"
           # Please don't change the mountPath
           volumeMounts:
             - name: cwagentconfig
@@ -501,7 +504,7 @@ spec:
                   apiVersion: v1
                   fieldPath: metadata.name
             - name: CI_VERSION
-              value: "k8s/1.3.16"
+              value: "k8s/1.3.17"
         resources:
             limits:
               memory: 200Mi