Fix translator unit test

aws · Jan 27, 2025 · 4538ab1 · 4538ab1
1 parent 6ef2a2a
commit 4538ab1
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 27 deletions.
diff --git a/translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml b/translator/tocwconfig/sampleConfig/advanced_config_darwin.yaml
@@ -31,6 +31,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     cumulativetodelta/hostDeltaMetrics:
         exclude:
             match_type: strict
@@ -86,8 +87,8 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_netstat
                 - telegraf_swap
@@ -98,9 +99,9 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - cumulativetodelta/hostDeltaMetrics
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_diskio
     telemetry:

diff --git a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml
@@ -31,6 +31,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     cumulativetodelta/hostDeltaMetrics:
         exclude:
             match_type: strict
@@ -94,8 +95,8 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_ethtool
                 - telegraf_nvidia_smi
@@ -108,9 +109,9 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - cumulativetodelta/hostDeltaMetrics
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_diskio
     telemetry:

diff --git a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml
@@ -31,6 +31,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     ec2tagger:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
@@ -87,8 +88,8 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_win_perf_counters/2073218482
                 - telegraf_win_perf_counters/2039663244

diff --git a/translator/tocwconfig/sampleConfig/amp_config_linux.yaml b/translator/tocwconfig/sampleConfig/amp_config_linux.yaml
@@ -89,6 +89,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     batch/host/amp:
         metadata_cardinality_limit: 1000
         send_batch_max_size: 0
@@ -152,9 +153,9 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
                 - transform
+                - awsentity/resource
             receivers:
                 - telegraf_cpu
     telemetry:

diff --git a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml
@@ -31,6 +31,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     ec2tagger:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
@@ -60,8 +61,8 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_mem
                 - telegraf_disk

diff --git a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml
@@ -31,6 +31,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     ec2tagger:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
@@ -62,8 +63,8 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_win_perf_counters/1492679118
                 - telegraf_win_perf_counters/4283769065

diff --git a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml
@@ -105,6 +105,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     awsentity/service/telegraf:
         entity_type: Service
         platform: ec2
@@ -280,9 +281,9 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
                 - transform
+                - awsentity/resource
             receivers:
                 - telegraf_disk
                 - telegraf_swap
@@ -305,10 +306,10 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - cumulativetodelta/hostDeltaMetrics
                 - ec2tagger
                 - transform
+                - awsentity/resource
             receivers:
                 - telegraf_diskio
                 - telegraf_net

diff --git a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml
@@ -111,6 +111,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     awsentity/service/telegraf:
         entity_type: Service
         platform: ec2
@@ -387,9 +388,9 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
                 - transform
+                - awsentity/resource
             receivers:
                 - telegraf_swap
                 - telegraf_cpu
@@ -412,10 +413,10 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - cumulativetodelta/hostDeltaMetrics/cloudwatch
                 - ec2tagger
                 - transform
+                - awsentity/resource
             receivers:
                 - telegraf_net
                 - telegraf_diskio

diff --git a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml
@@ -105,6 +105,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     awsentity/service/telegraf:
         entity_type: Service
         platform: ec2
@@ -267,9 +268,9 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
                 - transform
+                - awsentity/resource
             receivers:
                 - telegraf_win_perf_counters/1063858558
                 - telegraf_nvidia_smi

diff --git a/translator/tocwconfig/sampleConfig/delta_config_linux.yaml b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml
@@ -31,6 +31,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     cumulativetodelta/hostDeltaMetrics:
         exclude:
             match_type: strict
@@ -80,10 +81,10 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - cumulativetodelta/hostDeltaMetrics
                 - ec2tagger
                 - transform
+                - awsentity/resource
             receivers:
                 - telegraf_diskio
     telemetry:

diff --git a/translator/tocwconfig/sampleConfig/delta_net_config_linux.yaml b/translator/tocwconfig/sampleConfig/delta_net_config_linux.yaml
@@ -31,6 +31,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     cumulativetodelta/hostDeltaMetrics:
         exclude:
             match_type: ""
@@ -63,9 +64,9 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - cumulativetodelta/hostDeltaMetrics
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_net
     telemetry:

diff --git a/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml
@@ -36,6 +36,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     ec2tagger:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
@@ -80,9 +81,9 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
                 - transform
+                - awsentity/resource
             receivers:
                 - telegraf_cpu
                 - telegraf_disk

diff --git a/translator/tocwconfig/sampleConfig/ignore_append_dimensions.yaml b/translator/tocwconfig/sampleConfig/ignore_append_dimensions.yaml
@@ -31,6 +31,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     ec2tagger:
         imds_retries: 1
         middleware: agenthealth/statuscode
@@ -54,8 +55,8 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_mem
                 - telegraf_disk

diff --git a/translator/tocwconfig/sampleConfig/invalid_input_linux.yaml b/translator/tocwconfig/sampleConfig/invalid_input_linux.yaml
@@ -31,6 +31,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     ec2tagger:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
@@ -60,8 +61,8 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_mem
                 - telegraf_disk

diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml
@@ -31,6 +31,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     cumulativetodelta/hostDeltaMetrics:
         exclude:
             match_type: strict
@@ -81,8 +82,8 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_mem
                 - telegraf_swap
@@ -92,9 +93,9 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - cumulativetodelta/hostDeltaMetrics
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_diskio
     telemetry:

diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml
@@ -35,6 +35,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     cumulativetodelta/hostDeltaMetrics:
         exclude:
             match_type: strict
@@ -88,8 +89,8 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_cpu
                 - telegraf_disk
@@ -99,9 +100,9 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - cumulativetodelta/hostDeltaMetrics
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_diskio
     telemetry:

diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml
@@ -31,6 +31,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     ec2tagger:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
@@ -76,8 +77,8 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_win_perf_counters/3762679655
                 - telegraf_win_perf_counters/4283769065

diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml
@@ -35,6 +35,7 @@ processors:
     awsentity/resource:
         entity_type: Resource
         platform: ec2
+        scrape_datapoint_attribute: true
     ec2tagger:
         ec2_instance_tag_keys:
             - AutoScalingGroupName
@@ -83,8 +84,8 @@ service:
             exporters:
                 - awscloudwatch
             processors:
-                - awsentity/resource
                 - ec2tagger
+                - awsentity/resource
             receivers:
                 - telegraf_win_perf_counters/3762679655
                 - telegraf_win_perf_counters/4283769065