From 22d82e81f9de64608b30e2910138592bed42ce42 Mon Sep 17 00:00:00 2001
From: Kaushik Surya <kausyas@amazon.com>
Date: Wed, 18 Dec 2024 01:31:28 +0000
Subject: [PATCH] release v3.0.0

---
 RELEASE_NOTES                                 |  17 ++
 .../Chart.yaml                                |   2 +-
 .../values.yaml                               | 194 +++++++-----------
 3 files changed, 92 insertions(+), 121 deletions(-)

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 1dbd49d..b2616c4 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,3 +1,20 @@
+=======================================================================
+amazon-cloudwatch-observability v3.0.0 (2024-12-17)
+========================================================================
+New Features:
+* Add support for installing multiple AmazonCloudWatchAgent workloads (#126)
+* Introduce support for Prometheus scraping with the CloudWatchAgent and TargetAllocator (#126)
+* Set default PriorityClass as system-node-critical for CloudWatchAgent and FluentBit daemonsets (#137)
+
+Enhancements:
+* Unify schema for Application Signals metrics across platforms
+* Increment ADOT JAVA SDK to v1.32.6 for Application Signals
+
+Bug Fixes:
+* Do not apply default tolerations to controller manager deployment (#137)
+* Avoid excessive logging of 404 errors when IMDS tags access is not enabled
+* Fix edge case that causes the CloudWatchAgent to crash with a concurrent map writes error
+
 =======================================================================
 amazon-cloudwatch-observability v2.6.0 (2024-12-06)
 ========================================================================
diff --git a/charts/amazon-cloudwatch-observability/Chart.yaml b/charts/amazon-cloudwatch-observability/Chart.yaml
index 4972f14..6d32309 100644
--- a/charts/amazon-cloudwatch-observability/Chart.yaml
+++ b/charts/amazon-cloudwatch-observability/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: amazon-cloudwatch-observability
-version: 2.6.0
+version: 3.0.0
 appVersion: 1.0.0
 description: A Helm chart for Amazon CloudWatch Observability
 type: application
diff --git a/charts/amazon-cloudwatch-observability/values.yaml b/charts/amazon-cloudwatch-observability/values.yaml
index f00c6da..1a9a069 100644
--- a/charts/amazon-cloudwatch-observability/values.yaml
+++ b/charts/amazon-cloudwatch-observability/values.yaml
@@ -14,153 +14,115 @@ nodeLabelKey: node.kubernetes.io/instance-type
 fargateLabelKey: eks.amazonaws.com/compute-type
 ## NVIDIA GPU instance types
 gpuInstances:
-  - g3.4xlarge
-  - g3.8xlarge
-  - g3.16xlarge
-  - g3s.xlarge
+  - g4ad.16xlarge
   - g4ad.2xlarge
   - g4ad.4xlarge
   - g4ad.8xlarge
-  - g4ad.16xlarge
   - g4ad.xlarge
+  - g4dn.12xlarge
+  - g4dn.16xlarge
   - g4dn.2xlarge
   - g4dn.4xlarge
   - g4dn.8xlarge
-  - g4dn.12xlarge
-  - g4dn.16xlarge
   - g4dn.metal
   - g4dn.xlarge
-  - g5.2xlarge
-  - g5.4xlarge
-  - g5.8xlarge
   - g5.12xlarge
   - g5.16xlarge
   - g5.24xlarge
+  - g5.2xlarge
   - g5.48xlarge
-  - g5.xlarge
+  - g5.4xlarge
+  - g5.8xlarge
+  - g5g.16xlarge
   - g5g.2xlarge
   - g5g.4xlarge
   - g5g.8xlarge
-  - g5g.16xlarge
   - g5g.metal
   - g5g.xlarge
-  - g6.2xlarge
-  - g6.4xlarge
-  - g6.8xlarge
+  - g5.xlarge
   - g6.12xlarge
   - g6.16xlarge
   - g6.24xlarge
+  - g6.2xlarge
   - g6.48xlarge
-  - g6.xlarge
-  - g6e.2xlarge
-  - g6e.4xlarge
-  - g6e.8xlarge
+  - g6.4xlarge
+  - g6.8xlarge
   - g6e.12xlarge
   - g6e.16xlarge
   - g6e.24xlarge
+  - g6e.2xlarge
   - g6e.48xlarge
+  - g6e.4xlarge
+  - g6e.8xlarge
   - g6e.xlarge
+  - g6.xlarge
   - gr6.4xlarge
   - gr6.8xlarge
-  - p2.8xlarge
   - p2.16xlarge
+  - p2.8xlarge
   - p2.xlarge
+  - p3.16xlarge
   - p3.2xlarge
   - p3.8xlarge
-  - p3.16xlarge
   - p3dn.24xlarge
   - p4d.24xlarge
-  - p4de.24xlarge
   - p5.48xlarge
-  - p5e.48xlarge
-  - ml.g3.4xlarge
-  - ml.g3.8xlarge
-  - ml.g3.16xlarge
-  - ml.g3s.xlarge
-  - ml.g4ad.2xlarge
-  - ml.g4ad.4xlarge
-  - ml.g4ad.8xlarge
-  - ml.g4ad.16xlarge
-  - ml.g4ad.xlarge
+  - ml.g4dn.12xlarge
+  - ml.g4dn.16xlarge
   - ml.g4dn.2xlarge
   - ml.g4dn.4xlarge
   - ml.g4dn.8xlarge
-  - ml.g4dn.12xlarge
-  - ml.g4dn.16xlarge
-  - ml.g4dn.metal
   - ml.g4dn.xlarge
-  - ml.g5.2xlarge
-  - ml.g5.4xlarge
-  - ml.g5.8xlarge
   - ml.g5.12xlarge
   - ml.g5.16xlarge
   - ml.g5.24xlarge
+  - ml.g5.2xlarge
   - ml.g5.48xlarge
+  - ml.g5.4xlarge
+  - ml.g5.8xlarge
   - ml.g5.xlarge
-  - ml.g5g.2xlarge
-  - ml.g5g.4xlarge
-  - ml.g5g.8xlarge
-  - ml.g5g.16xlarge
-  - ml.g5g.metal
-  - ml.g5g.xlarge
-  - ml.g6.2xlarge
-  - ml.g6.4xlarge
-  - ml.g6.8xlarge
   - ml.g6.12xlarge
   - ml.g6.16xlarge
   - ml.g6.24xlarge
+  - ml.g6.2xlarge
   - ml.g6.48xlarge
-  - ml.g6.xlarge
-  - ml.g6e.2xlarge
-  - ml.g6e.4xlarge
-  - ml.g6e.8xlarge
+  - ml.g6.4xlarge
+  - ml.g6.8xlarge
   - ml.g6e.12xlarge
   - ml.g6e.16xlarge
   - ml.g6e.24xlarge
+  - ml.g6e.2xlarge
   - ml.g6e.48xlarge
+  - ml.g6e.4xlarge
+  - ml.g6e.8xlarge
   - ml.g6e.xlarge
+  - ml.g6.xlarge
   - ml.gr6.4xlarge
   - ml.gr6.8xlarge
-  - ml.p2.8xlarge
   - ml.p2.16xlarge
+  - ml.p2.8xlarge
   - ml.p2.xlarge
+  - ml.p3.16xlarge
   - ml.p3.2xlarge
   - ml.p3.8xlarge
-  - ml.p3.16xlarge
   - ml.p3dn.24xlarge
   - ml.p4d.24xlarge
   - ml.p4de.24xlarge
   - ml.p5.48xlarge
-  - ml.p5e.48xlarge
 ## Tranium/Infrentia instance types
 neuronInstances:
-  - trn1.2xlarge
-  - trn1.32xlarge
-  - trn1n.32xlarge
-  - trn2.3xlarge
-  - trn2.48xlarge
-  - trn2a.48xlarge
-  - trn2n.48xlarge
-  - trn2u.48xlarg
-  - inf1.xlarge
-  - inf1.2xlarge
-  - inf1.6xlarge
-  - inf1.24xlarge
-  - inf2.xlarge
-  - inf2.8xlarge
-  - inf2.24xlarge
-  - inf2.48xlarge
-  - ml.trn1.2xlarge
-  - ml.trn1.32xlarge
-  - ml.trn1n.32xlarge
-  - ml.inf1.xlarge
+  - ""
+  - ml.inf1.24xlarge
   - ml.inf1.2xlarge
   - ml.inf1.6xlarge
-  - ml.inf1.24xlarge
-  - ml.inf2.xlarge
-  - ml.inf2.8xlarge
+  - ml.inf1.xlarge
   - ml.inf2.24xlarge
   - ml.inf2.48xlarge
+  - ml.inf2.8xlarge
+  - ml.inf2.xlarge
+  - ml.trn1.2xlarge
+  - ml.trn1.32xlarge
+  - ml.trn1n.32xlarge
 ## Provide default tolerations
 tolerations:
   - operator: Exists
@@ -184,7 +146,7 @@ containerLogs:
       requests:
         cpu: 50m
         memory: 25Mi
-    priorityClassName: "system-node-critical"
+    priorityClassName: system-node-critical
     config:
       service: |
         [SERVICE]
@@ -204,14 +166,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 +195,7 @@ containerLogs:
             Rotate_Wait         30
             storage.type        filesystem
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [INPUT]
             Name                tail
             Tag                 application.*
@@ -244,7 +206,7 @@ containerLogs:
             Skip_Long_Lines     On
             Refresh_Interval    10
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [INPUT]
             Name                tail
             Tag                 application.*
@@ -255,14 +217,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 +240,7 @@ containerLogs:
             Kubelet_Port        10250
             Buffer_Size         0
             Use_Pod_Association On
-          
+
           [OUTPUT]
             Name                cloudwatch_logs
             Match               application.*
@@ -298,7 +260,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 +273,7 @@ containerLogs:
             Rotate_Wait         30
             storage.type        filesystem
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [FILTER]
             Name                modify
             Match               dataplane.systemd.*
@@ -319,12 +281,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 +974,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 +984,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 +1012,7 @@ containerLogs:
             Rotate_Wait         30
             Refresh_Interval    10
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [INPUT]
             Name                tail
             Tag                 application.*
@@ -1062,7 +1024,7 @@ containerLogs:
             Rotate_Wait         30
             Refresh_Interval    10
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [INPUT]
             Name                tail
             Tag                 application.*
@@ -1074,7 +1036,7 @@ containerLogs:
             Rotate_Wait         30
             Refresh_Interval    10
             Read_from_Head      ${READ_FROM_HEAD}
-          
+
           [OUTPUT]
             Name                cloudwatch_logs
             Match               application.*
@@ -1095,7 +1057,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 +1076,7 @@ containerLogs:
             Channels            EKS
             DB                  C:\\var\\fluent-bit\\state\\flb_eks_winlog.db
             Interval_Sec        60
-          
+
           [FILTER]
             Name                aws
             Match               dataplane.*
@@ -1124,7 +1086,7 @@ containerLogs:
             Name                aws
             Match               winlog.*
             imds_version        v2
-          
+
           [OUTPUT]
             Name                cloudwatch_logs
             Match               dataplane.*
@@ -1148,12 +1110,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 +1124,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 +1272,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 +1289,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
@@ -1361,21 +1320,14 @@ agent:
   config: # optional config that can be provided to override the defaultConfig
   otelConfig: # optional YAML config that can be provided to combine with the config/defaultConfig
   defaultConfig:
-    {
-      "logs": {
-        "metrics_collected": {
-          "kubernetes": {
-            "enhanced_container_insights": true
-          },
-          "application_signals": { }
-        }
-      },
-      "traces": {
-        "traces_collected": {
-          "application_signals": { }
-        }
-      }
-    }
+    logs:
+      metrics_collected:
+        kubernetes:
+          enhanced_container_insights: true
+        application_signals: {}
+    traces:
+      traces_collected:
+        application_signals: {}
   prometheus:
     config:
     targetAllocator:
@@ -1391,7 +1343,6 @@ agent:
           us-gov-west-1: 743662458514.dkr.ecr.us-gov-west-1.amazonaws.com
       prometheusCR:
         enabled: false
-
 dcgmExporter:
   name:
   image:
@@ -1449,3 +1400,6 @@ neuronMonitor:
         - SYS_ADMIN
   serviceAccount:
     name: # override exporter service account name
+targetAllocator:
+  image:
+    tag: 1.0.0