From b80971d62ab8ed1dbc87bca29208de8a6ebd9130 Mon Sep 17 00:00:00 2001
From: Kaushik Surya <kausyas@amazon.com>
Date: Tue, 17 Dec 2024 23:34:13 -0500
Subject: [PATCH 1/3] Update CWAOperator to 2.0.1

---
 charts/amazon-cloudwatch-observability/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/amazon-cloudwatch-observability/values.yaml b/charts/amazon-cloudwatch-observability/values.yaml
index f00c6da..ba4a67e 100644
--- a/charts/amazon-cloudwatch-observability/values.yaml
+++ b/charts/amazon-cloudwatch-observability/values.yaml
@@ -1169,7 +1169,7 @@ manager:
   name:
   image:
     repository: cloudwatch-agent-operator
-    tag: 2.0.0
+    tag: 2.0.1
     repositoryDomainMap:
       public: public.ecr.aws/cloudwatch-agent
       cn-north-1: 934860584483.dkr.ecr.cn-north-1.amazonaws.com.cn

From cce0aac2f382fb688051f54c383261f968db44f1 Mon Sep 17 00:00:00 2001
From: Kaushik Surya <kausyas@amazon.com>
Date: Wed, 18 Dec 2024 00:10:08 -0500
Subject: [PATCH 2/3] Formatting fixes

---
 .../values.yaml                               | 54 +++++++++----------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/charts/amazon-cloudwatch-observability/values.yaml b/charts/amazon-cloudwatch-observability/values.yaml
index ba4a67e..b6ad767 100644
--- a/charts/amazon-cloudwatch-observability/values.yaml
+++ b/charts/amazon-cloudwatch-observability/values.yaml
@@ -184,7 +184,7 @@ containerLogs:
       requests:
         cpu: 50m
         memory: 25Mi
-    priorityClassName: "system-node-critical"
+    priorityClassName: system-node-critical
     config:
       service: |
         [SERVICE]
@@ -204,14 +204,14 @@ containerLogs:
           Regex               ^(?<time>[^ ]* {1,2}[^ ]* [^ ]*) (?<host>[^ ]*) (?<ident>[a-zA-Z0-9_\/\.\-]*)(?:\[(?<pid>[0-9]+)\])?(?:[^\:]*\:)? *(?<message>.*)$
           Time_Key            time
           Time_Format         %b %d %H:%M:%S
-        
+
         [PARSER]
           Name                container_firstline
           Format              regex
           Regex               (?<log>(?<="log":")\S(?!\.).*?)(?<!\\)".*(?<stream>(?<="stream":").*?)".*(?<time>\d{4}-\d{1,2}-\d{1,2}T\d{2}:\d{2}:\d{2}\.\w*).*(?=})
           Time_Key            time
           Time_Format         %Y-%m-%dT%H:%M:%S.%LZ
-        
+
         [PARSER]
           Name                cwagent_firstline
           Format              regex
@@ -233,7 +233,7 @@ containerLogs:
             Rotate_Wait         30
             storage.type        filesystem
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [INPUT]
             Name                tail
             Tag                 application.*
@@ -244,7 +244,7 @@ containerLogs:
             Skip_Long_Lines     On
             Refresh_Interval    10
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [INPUT]
             Name                tail
             Tag                 application.*
@@ -255,14 +255,14 @@ containerLogs:
             Skip_Long_Lines     On
             Refresh_Interval    10
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [FILTER]
             Name                aws
             Match               application.*
             az                  false
             ec2_instance_id     false
             Enable_Entity       true
-          
+
           [FILTER]
             Name                kubernetes
             Match               application.*
@@ -278,7 +278,7 @@ containerLogs:
             Kubelet_Port        10250
             Buffer_Size         0
             Use_Pod_Association On
-          
+
           [OUTPUT]
             Name                cloudwatch_logs
             Match               application.*
@@ -298,7 +298,7 @@ containerLogs:
             DB                  /var/fluent-bit/state/systemd.db
             Path                /var/log/journal
             Read_From_Tail      ${READ_FROM_TAIL}
-          
+
           [INPUT]
             Name                tail
             Tag                 dataplane.tail.*
@@ -311,7 +311,7 @@ containerLogs:
             Rotate_Wait         30
             storage.type        filesystem
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [FILTER]
             Name                modify
             Match               dataplane.systemd.*
@@ -319,12 +319,12 @@ containerLogs:
             Rename              _SYSTEMD_UNIT               systemd_unit
             Rename              MESSAGE                     message
             Remove_regex        ^((?!hostname|systemd_unit|message).)*$
-          
+
           [FILTER]
             Name                aws
             Match               dataplane.*
             imds_version        v2
-          
+
           [OUTPUT]
             Name                cloudwatch_logs
             Match               dataplane.*
@@ -1012,7 +1012,7 @@ containerLogs:
           Daemon                      off
           net.dns.resolver            LEGACY
           Parsers_File                parsers.conf
-        
+
           @INCLUDE application-log.conf
           @INCLUDE dataplane-log.conf
           @INCLUDE host-log.conf
@@ -1022,14 +1022,14 @@ containerLogs:
           Format              json
           Time_Key            time
           Time_Format         %b %d %H:%M:%S
-        
+
         [PARSER]
           Name                container_firstline
           Format              regex
           Regex               (?<log>(?<="log":")\S(?!\.).*?)(?<!\\)".*(?<stream>(?<="stream":").*?)".*(?<time>\d{4}-\d{1,2}-\d{1,2}T\d{2}:\d{2}:\d{2}\.\w*).*(?=})
           Time_Key            time
           Time_Format         %Y-%m-%dT%H:%M:%S.%LZ
-        
+
         [PARSER]
           Name                dataplane_firstline
           Format              regex
@@ -1050,7 +1050,7 @@ containerLogs:
             Rotate_Wait         30
             Refresh_Interval    10
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [INPUT]
             Name                tail
             Tag                 application.*
@@ -1062,7 +1062,7 @@ containerLogs:
             Rotate_Wait         30
             Refresh_Interval    10
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [INPUT]
             Name                tail
             Tag                 application.*
@@ -1074,7 +1074,7 @@ containerLogs:
             Rotate_Wait         30
             Refresh_Interval    10
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [OUTPUT]
             Name                cloudwatch_logs
             Match               application.*
@@ -1095,7 +1095,7 @@ containerLogs:
             Rotate_Wait         30
             Refresh_Interval    10
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [INPUT]
             Name                tail
             Tag                 dataplane.tail.C.ProgramData.Amazon.EKS.logs.vpc-bridge
@@ -1114,7 +1114,7 @@ containerLogs:
             Channels            EKS
             DB                  C:\\var\\fluent-bit\\state\\flb_eks_winlog.db
             Interval_Sec        60
-          
+
           [FILTER]
             Name                aws
             Match               dataplane.*
@@ -1124,7 +1124,7 @@ containerLogs:
             Name                aws
             Match               winlog.*
             imds_version        v2
-          
+
           [OUTPUT]
             Name                cloudwatch_logs
             Match               dataplane.*
@@ -1148,12 +1148,12 @@ containerLogs:
             Channels            System
             DB                  C:\\var\\fluent-bit\\state\\flb_system_winlog.db
             Interval_Sec        60
-          
+
           [FILTER]
             Name                aws
             Match               winlog.*
             imds_version        v2
-          
+
           [OUTPUT]
             Name                cloudwatch_logs
             Match               winlog.*
@@ -1162,7 +1162,6 @@ containerLogs:
             log_stream_name     ${HOST_NAME}.windows.system.events
             auto_create_group   true
             extra_user_agent    container-insights
-
 ## Provide CloudWatchAgent Operator manager container image and resources.
 ##
 manager:
@@ -1311,11 +1310,9 @@ admissionWebhooks:
   secretAnnotations: {}
   ## Secret labels
   secretLabels: {}
-
 ## List of AmazonCloudWatchAgent workloads to install & manage, each representing an independent installation of the AmazonCloudWatchAgent CustomResource. Each entry in this list uses the schema & the defaults from $.agent, so only provide any overrides here.
 agents:
   - name: cloudwatch-agent
-
 agent:
   name:
   mode: # represents the mode the cloudwatch-agent will run in (deployment, daemonset or statefulset)
@@ -1330,7 +1327,7 @@ agent:
       us-gov-east-1: 743662458514.dkr.ecr.us-gov-east-1.amazonaws.com
       us-gov-west-1: 743662458514.dkr.ecr.us-gov-west-1.amazonaws.com
   enabled: true
-  priorityClassName: "system-node-critical"
+  priorityClassName: system-node-critical
   resources:
     requests:
       memory: 128Mi
@@ -1391,7 +1388,6 @@ agent:
           us-gov-west-1: 743662458514.dkr.ecr.us-gov-west-1.amazonaws.com
       prometheusCR:
         enabled: false
-
 dcgmExporter:
   name:
   image:
@@ -1448,4 +1444,4 @@ neuronMonitor:
       add:
         - SYS_ADMIN
   serviceAccount:
-    name: # override exporter service account name
+    name: # override exporter service account name
\ No newline at end of file

From cd92c31a8937bb8f1e328fd11772b393c96d6ba8 Mon Sep 17 00:00:00 2001
From: Kaushik Surya <kausyas@amazon.com>
Date: Wed, 18 Dec 2024 00:17:41 -0500
Subject: [PATCH 3/3] Formatting fixes

---
 .../templates/linux/cloudwatch-agent-custom-resource.yaml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml b/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml
index 770473f..0f57f59 100644
--- a/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml
+++ b/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml
@@ -4,7 +4,7 @@
 {{- range $i, $customAgent := .Values.agents }}
 {{ $altNames = append $altNames ( printf "%s-target-allocator-service" $customAgent.name )}}
 {{- end }}
-  {{- $agentAltNames := list ( printf "%s" (include "cloudwatch-agent.name" .) ) ( printf "%s.%s.svc" (include "cloudwatch-agent.name" .) .Release.Namespace ) -}}
+{{- $agentAltNames := list ( printf "%s" (include "cloudwatch-agent.name" .) ) ( printf "%s.%s.svc" (include "cloudwatch-agent.name" .) .Release.Namespace ) -}}
 {{- $ca := genCA ("agent-ca")  ( .Values.agent.autoGenerateCert.expiryDays | int ) -}}
 {{- $cert := genSignedCert ("agent") nil $altNames ( .Values.admissionWebhooks.autoGenerateCert.expiryDays | int ) $ca -}}
 {{- $serverCert := genSignedCert ("agent-server") nil $agentAltNames ( .Values.admissionWebhooks.autoGenerateCert.expiryDays | int ) $ca -}}