Test works just need to fix other tests

Author: Paramadon

go.mod

@@ -1,6 +1,6 @@
 module github.com/aws/amazon-cloudwatch-agent
 
-go 1.24.4
+go 1.24.0
 
 replace github.com/influxdata/telegraf => github.com/aws/telegraf v0.10.2-0.20250113150713-a2dfaa4cdf6d
 

translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml

@@ -47,9 +47,9 @@ processors:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
         ec2_metadata_tags:
+            - ImageId
             - InstanceId
             - InstanceType
-            - ImageId
         imds_retries: 1
         middleware: agenthealth/statuscode
         refresh_tags_interval: 0s

translator/tocwconfig/sampleConfig/advanced_config_linux.yaml

@@ -100,13 +100,13 @@ service:
                 - ec2tagger
                 - awsentity/resource
             receivers:
-                - telegraf_mem
+                - telegraf_cpu
                 - telegraf_netstat
                 - telegraf_swap
-                - telegraf_ethtool
                 - telegraf_nvidia_smi
-                - telegraf_cpu
                 - telegraf_disk
+                - telegraf_mem
+                - telegraf_ethtool
         metrics/hostDeltaMetrics:
             exporters:
                 - awscloudwatch

translator/tocwconfig/sampleConfig/advanced_config_windows.conf

@@ -18,6 +18,7 @@
 
   [[inputs.win_perf_counters]]
     DisableReplacer = true
+    alias = "4283769065"
     interval = "1s"
 
     [[inputs.win_perf_counters.object]]
@@ -26,41 +27,83 @@
       Measurement = "LogicalDisk"
       ObjectName = "LogicalDisk"
       WarnOnMissing = true
+    [inputs.win_perf_counters.tags]
+      "aws:StorageResolution" = "true"
+
+  [[inputs.win_perf_counters]]
+    DisableReplacer = true
+    alias = "1492679118"
+    interval = "1s"
 
     [[inputs.win_perf_counters.object]]
       Counters = ["% Committed Bytes In Use"]
       Instances = ["------"]
       Measurement = "Memory"
       ObjectName = "Memory"
       WarnOnMissing = true
+    [inputs.win_perf_counters.tags]
+      "aws:StorageResolution" = "true"
+
+  [[inputs.win_perf_counters]]
+    DisableReplacer = true
+    alias = "3610923661"
+    interval = "1s"
 
     [[inputs.win_perf_counters.object]]
       Counters = ["% Usage"]
       Instances = ["*"]
       Measurement = "Paging File"
       ObjectName = "Paging File"
       WarnOnMissing = true
+    [inputs.win_perf_counters.tags]
+      "aws:StorageResolution" = "true"
+
+  [[inputs.win_perf_counters]]
+    DisableReplacer = true
+    alias = "3446270237"
+    interval = "1s"
 
     [[inputs.win_perf_counters.object]]
       Counters = ["% Disk Time", "Disk Write Bytes/sec", "Disk Read Bytes/sec", "Disk Writes/sec", "Disk Reads/sec"]
       Instances = ["*"]
       Measurement = "PhysicalDisk"
       ObjectName = "PhysicalDisk"
       WarnOnMissing = true
+    [inputs.win_perf_counters.tags]
+      "aws:StorageResolution" = "true"
+
+  [[inputs.win_perf_counters]]
+    DisableReplacer = true
+    alias = "3762679655"
+    interval = "1s"
 
     [[inputs.win_perf_counters.object]]
       Counters = ["% User Time", "% Idle Time", "% Interrupt Time"]
       Instances = ["*"]
       Measurement = "Processor"
       ObjectName = "Processor"
       WarnOnMissing = true
+    [inputs.win_perf_counters.tags]
+      "aws:StorageResolution" = "true"
+
+  [[inputs.win_perf_counters]]
+    DisableReplacer = true
+    alias = "2073218482"
+    interval = "1s"
 
     [[inputs.win_perf_counters.object]]
       Counters = ["Connections Established"]
       Instances = ["------"]
       Measurement = "TCPv4"
       ObjectName = "TCPv4"
       WarnOnMissing = true
+    [inputs.win_perf_counters.tags]
+      "aws:StorageResolution" = "true"
+
+  [[inputs.win_perf_counters]]
+    DisableReplacer = true
+    alias = "2039663244"
+    interval = "1s"
 
     [[inputs.win_perf_counters.object]]
       Counters = ["Connections Established"]
@@ -73,4 +116,4 @@
 
 [outputs]
 
-  [[outputs.cloudwatch]]
+  [[outputs.cloudwatch]]

translator/tocwconfig/sampleConfig/advanced_config_windows.yaml

@@ -92,13 +92,13 @@ service:
                 - ec2tagger
                 - awsentity/resource
             receivers:
+                - telegraf_win_perf_counters/2073218482
+                - telegraf_win_perf_counters/2039663244
                 - telegraf_win_perf_counters/4283769065
                 - telegraf_win_perf_counters/1492679118
                 - telegraf_win_perf_counters/3610923661
                 - telegraf_win_perf_counters/3446270237
                 - telegraf_win_perf_counters/3762679655
-                - telegraf_win_perf_counters/2073218482
-                - telegraf_win_perf_counters/2039663244
     telemetry:
         logs:
             encoding: console

translator/tocwconfig/sampleConfig/appsignals_and_ecs_config.conf

@@ -14,14 +14,12 @@
   quiet = false
   round_interval = false
 
-[inputs]
-
 [outputs]
 
   [[outputs.cloudwatchlogs]]
     endpoint_override = "https://fake_endpoint"
     force_flush_interval = "5s"
     log_stream_name = "arn_aws_ecs_us-east-1_account_id_task/task_id"
+    mode = "EC2"
     region = "us-east-1"
-
-[processors]
+    region_type = "ACJ"

translator/tocwconfig/sampleConfig/appsignals_and_eks_config.conf

@@ -14,14 +14,12 @@
   quiet = false
   round_interval = false
 
-[inputs]
-
 [outputs]
 
   [[outputs.cloudwatchlogs]]
     endpoint_override = "https://fake_endpoint"
     force_flush_interval = "5s"
     log_stream_name = "host_name_from_env"
+    mode = "EKS"
     region = "us-east-1"
-
-[processors]
+    region_type = "ACJ"

translator/tocwconfig/sampleConfig/appsignals_and_k8s_config.conf

@@ -14,14 +14,12 @@
   quiet = false
   round_interval = false
 
-[inputs]
-
 [outputs]
 
   [[outputs.cloudwatchlogs]]
     endpoint_override = "https://fake_endpoint"
     force_flush_interval = "5s"
     log_stream_name = "host_name_from_env"
+    mode = "K8E"
     region = "us-east-1"
-
-[processors]
+    region_type = "ACJ"

translator/tocwconfig/sampleConfig/appsignals_fallback_and_eks_config.conf

@@ -14,14 +14,12 @@
   quiet = false
   round_interval = false
 
-[inputs]
-
 [outputs]
 
   [[outputs.cloudwatchlogs]]
     endpoint_override = "https://fake_endpoint"
     force_flush_interval = "5s"
     log_stream_name = "host_name_from_env"
+    mode = "EKS"
     region = "us-east-1"
-
-[processors]
+    region_type = "ACJ"

translator/tocwconfig/sampleConfig/appsignals_over_fallback_config.conf

@@ -14,14 +14,12 @@
   quiet = false
   round_interval = false
 
-[inputs]
-
 [outputs]
 
   [[outputs.cloudwatchlogs]]
     endpoint_override = "https://fake_endpoint"
     force_flush_interval = "5s"
     log_stream_name = "host_name_from_env"
+    mode = "EKS"
     region = "us-east-1"
-
-[processors]
+    region_type = "ACJ"