Skip to content

Commit 65265df

Browse files
PaamickyPaamicky
committed
address comments
1 parent 67048a9 commit 65265df

4 files changed

Lines changed: 56 additions & 60 deletions

File tree

‎translator/tocwconfig/sampleConfig/opentelemetry/combined_v1_v2_ec2_config.yaml‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,9 @@ processors:
542542
ec2_instance_tag_keys:
543543
- AutoScalingGroupName
544544
ec2_metadata_tags:
545-
- InstanceType
546545
- ImageId
547546
- InstanceId
547+
- InstanceType
548548
imds_retries: 1
549549
middleware: agenthealth/statuscode
550550
refresh_tags_interval: 0s
@@ -1400,6 +1400,21 @@ receivers:
14001400
honor_timestamps: true
14011401
job_name: test_app
14021402
metrics_path: /metrics
1403+
relabel_configs:
1404+
- action: replace
1405+
regex: (.*)
1406+
replacement: $$$$1
1407+
separator: ;
1408+
source_labels:
1409+
- __meta_kubernetes_pod_name
1410+
target_label: pod
1411+
- action: replace
1412+
regex: (.*)
1413+
replacement: $$$${1}
1414+
separator: ;
1415+
source_labels:
1416+
- __address__
1417+
target_label: host
14031418
scheme: http
14041419
scrape_interval: 30s
14051420
scrape_protocols:
@@ -1568,13 +1583,13 @@ service:
15681583
- ec2tagger
15691584
- awsentity/resource
15701585
receivers:
1571-
- telegraf_cpu
1586+
- telegraf_mem
1587+
- telegraf_disk
15721588
- telegraf_swap
1589+
- telegraf_cpu
1590+
- telegraf_processes
15731591
- telegraf_procstat/1917393364
1574-
- telegraf_disk
15751592
- telegraf_netstat
1576-
- telegraf_mem
1577-
- telegraf_processes
15781593
metrics/host_metrics:
15791594
exporters:
15801595
- forward/opentelemetry
@@ -1590,8 +1605,8 @@ service:
15901605
- ec2tagger
15911606
- awsentity/service/telegraf
15921607
receivers:
1593-
- telegraf_socket_listener
15941608
- telegraf_statsd
1609+
- telegraf_socket_listener
15951610
metrics/hostDeltaMetrics:
15961611
exporters:
15971612
- awscloudwatch
@@ -1600,8 +1615,8 @@ service:
16001615
- ec2tagger
16011616
- awsentity/resource
16021617
receivers:
1603-
- telegraf_diskio
16041618
- telegraf_net
1619+
- telegraf_diskio
16051620
metrics/opentelemetry:
16061621
exporters:
16071622
- otlphttp/metrics

‎translator/tocwconfig/sampleConfig/opentelemetry/combined_v1_v2_eks_config.yaml‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -587,9 +587,9 @@ processors:
587587
ec2_instance_tag_keys:
588588
- AutoScalingGroupName
589589
ec2_metadata_tags:
590+
- InstanceType
590591
- ImageId
591592
- InstanceId
592-
- InstanceType
593593
imds_retries: 1
594594
middleware: agenthealth/statuscode
595595
refresh_tags_interval: 0s
@@ -2085,6 +2085,21 @@ receivers:
20852085
honor_timestamps: true
20862086
job_name: test_app
20872087
metrics_path: /metrics
2088+
relabel_configs:
2089+
- action: replace
2090+
regex: (.*)
2091+
replacement: $$$$1
2092+
separator: ;
2093+
source_labels:
2094+
- __meta_kubernetes_pod_name
2095+
target_label: pod
2096+
- action: replace
2097+
regex: (.*)
2098+
replacement: $$$${1}
2099+
separator: ;
2100+
source_labels:
2101+
- __address__
2102+
target_label: host
20882103
scheme: http
20892104
scrape_interval: 30s
20902105
scrape_protocols:
@@ -2423,13 +2438,13 @@ service:
24232438
- ec2tagger
24242439
- awsentity/resource
24252440
receivers:
2426-
- telegraf_mem
24272441
- telegraf_netstat
24282442
- telegraf_swap
24292443
- telegraf_processes
2430-
- telegraf_procstat/1917393364
2444+
- telegraf_mem
24312445
- telegraf_cpu
24322446
- telegraf_disk
2447+
- telegraf_procstat/1917393364
24332448
metrics/host_metrics:
24342449
exporters:
24352450
- forward/opentelemetry
@@ -2445,8 +2460,8 @@ service:
24452460
- ec2tagger
24462461
- awsentity/service/telegraf
24472462
receivers:
2448-
- telegraf_socket_listener
24492463
- telegraf_statsd
2464+
- telegraf_socket_listener
24502465
metrics/hostDeltaMetrics:
24512466
exporters:
24522467
- awscloudwatch
@@ -2455,8 +2470,8 @@ service:
24552470
- ec2tagger
24562471
- awsentity/resource
24572472
receivers:
2458-
- telegraf_net
24592473
- telegraf_diskio
2474+
- telegraf_net
24602475
metrics/opentelemetry:
24612476
exporters:
24622477
- otlphttp/metrics

‎translator/translate/otel/pipeline/opentelemetry/containerinsights/common_test.go‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -12,37 +12,6 @@ import (
1212
"github.com/aws/amazon-cloudwatch-agent/cfg/envconfig"
1313
)
1414

15-
func TestEscapeDollarDigit(t *testing.T) {
16-
tests := []struct {
17-
name string
18-
in string
19-
want string
20-
}{
21-
{"empty", "", ""},
22-
{"no dollar", "hello world", "hello world"},
23-
{"dollar at end", "regex$", "regex$"},
24-
{"dollar letter", "$FOO", "$FOO"},
25-
{"dollar brace", "${FOO}", "${FOO}"},
26-
{"bare $1", "replacement: $1", "replacement: $$1"},
27-
{"bare $0", "$0", "$$0"},
28-
{"bare $9", "$9", "$$9"},
29-
{"already escaped $$1", "$$1", "$$$1"},
30-
{"triple $$$1", "$$$1", "$$$$1"},
31-
{"consecutive $1$2", "$1$2", "$$1$$2"},
32-
{"multi-digit $10", "$10", "$$10"},
33-
{"mixed text", "tag: k8s.label.$1 and $FOO", "tag: k8s.label.$$1 and $FOO"},
34-
{"dollar dollar no digit", "$$FOO", "$$FOO"},
35-
}
36-
for _, tt := range tests {
37-
t.Run(tt.name, func(t *testing.T) {
38-
got := escapeDollarDigit(tt.in)
39-
if got != tt.want {
40-
t.Errorf("escapeDollarDigit(%q) = %q, want %q", tt.in, got, tt.want)
41-
}
42-
})
43-
}
44-
}
45-
4615
func TestGetRole_JSONConfig(t *testing.T) {
4716
cfg := confmap.NewFromStringMap(map[string]interface{}{
4817
"opentelemetry": map[string]interface{}{

‎translator/translate/otel/pipeline/opentelemetry/containerinsights/translators_test.go‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ func TestNewTranslators_MissingKey(t *testing.T) {
2222
func TestNewTranslators_RoleNode(t *testing.T) {
2323
cfg := confmap.NewFromStringMap(map[string]interface{}{
2424
"opentelemetry": map[string]interface{}{
25+
"cluster_name": "test-cluster",
2526
"collect": map[string]interface{}{
2627
"container_insights": map[string]interface{}{
27-
"cluster_name": "test-cluster",
28-
"role": "node",
28+
"role": "node",
2929
},
3030
},
3131
},
@@ -38,10 +38,10 @@ func TestNewTranslators_RoleNode(t *testing.T) {
3838
func TestNewTranslators_RoleNodeWithLogs(t *testing.T) {
3939
cfg := confmap.NewFromStringMap(map[string]interface{}{
4040
"opentelemetry": map[string]interface{}{
41+
"cluster_name": "test-cluster",
4142
"collect": map[string]interface{}{
4243
"container_insights": map[string]interface{}{
43-
"cluster_name": "test-cluster",
44-
"role": "node",
44+
"role": "node",
4545
"logs": map[string]interface{}{
4646
"enabled": true,
4747
},
@@ -57,10 +57,10 @@ func TestNewTranslators_RoleNodeWithLogs(t *testing.T) {
5757
func TestNewTranslators_RoleCluster(t *testing.T) {
5858
cfg := confmap.NewFromStringMap(map[string]interface{}{
5959
"opentelemetry": map[string]interface{}{
60+
"cluster_name": "test-cluster",
6061
"collect": map[string]interface{}{
6162
"container_insights": map[string]interface{}{
62-
"cluster_name": "test-cluster",
63-
"role": "cluster",
63+
"role": "cluster",
6464
},
6565
},
6666
},
@@ -74,10 +74,9 @@ func TestNewTranslators_DefaultRole(t *testing.T) {
7474
// No role specified, no env var - should default to node
7575
cfg := confmap.NewFromStringMap(map[string]interface{}{
7676
"opentelemetry": map[string]interface{}{
77+
"cluster_name": "test-cluster",
7778
"collect": map[string]interface{}{
78-
"container_insights": map[string]interface{}{
79-
"cluster_name": "test-cluster",
80-
},
79+
"container_insights": map[string]interface{}{},
8180
},
8281
},
8382
})
@@ -91,10 +90,9 @@ func TestNewTranslators_EnvVarFallback_Node(t *testing.T) {
9190
t.Setenv(envconfig.CWAGENT_ROLE, envconfig.NODE)
9291
cfg := confmap.NewFromStringMap(map[string]interface{}{
9392
"opentelemetry": map[string]interface{}{
93+
"cluster_name": "test-cluster",
9494
"collect": map[string]interface{}{
95-
"container_insights": map[string]interface{}{
96-
"cluster_name": "test-cluster",
97-
},
95+
"container_insights": map[string]interface{}{},
9896
},
9997
},
10098
})
@@ -108,10 +106,9 @@ func TestNewTranslators_EnvVarFallback_Leader(t *testing.T) {
108106
t.Setenv(envconfig.CWAGENT_ROLE, envconfig.LEADER)
109107
cfg := confmap.NewFromStringMap(map[string]interface{}{
110108
"opentelemetry": map[string]interface{}{
109+
"cluster_name": "test-cluster",
111110
"collect": map[string]interface{}{
112-
"container_insights": map[string]interface{}{
113-
"cluster_name": "test-cluster",
114-
},
111+
"container_insights": map[string]interface{}{},
115112
},
116113
},
117114
})
@@ -125,10 +122,10 @@ func TestNewTranslators_JSONConfigOverridesEnvVar(t *testing.T) {
125122
t.Setenv(envconfig.CWAGENT_ROLE, envconfig.NODE)
126123
cfg := confmap.NewFromStringMap(map[string]interface{}{
127124
"opentelemetry": map[string]interface{}{
125+
"cluster_name": "test-cluster",
128126
"collect": map[string]interface{}{
129127
"container_insights": map[string]interface{}{
130-
"cluster_name": "test-cluster",
131-
"role": "cluster",
128+
"role": "cluster",
132129
},
133130
},
134131
},

0 commit comments

Comments
 (0)