Skip to content

Commit dc12a5b

Browse files
authored
remove otelconsumer output from translated config (#11373)
* remove otelconsumer output from translated config * fix ci
1 parent 60eb3ed commit dc12a5b

File tree

11 files changed

+0
-46
lines changed

11 files changed

+0
-46
lines changed

docs/hybrid-agent-beats-receivers.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,6 @@ receivers:
155155
paths:
156156
- /var/log/*.log
157157
type: filestream
158-
output:
159-
otelconsumer: {}
160158
metricbeatreceiver:
161159
metricbeat:
162160
modules:
@@ -166,8 +164,6 @@ receivers:
166164
metricsets:
167165
- cpu
168166
module: system
169-
output:
170-
otelconsumer: {}
171167
exporters:
172168
elasticsearch/_agent-component/default:
173169
api_key: placeholder

internal/pkg/otel/samples/darwin/autoops_es.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ receivers:
2727
fields:
2828
temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID}
2929
token: ${env:AUTOOPS_TOKEN}
30-
output:
31-
otelconsumer:
3230
telemetry_types: ["logs"]
3331

3432
exporters:

internal/pkg/otel/samples/darwin/autoops_es_debug.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ receivers:
2727
fields:
2828
temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID}
2929
token: ${env:AUTOOPS_TOKEN}
30-
output:
31-
otelconsumer:
3230
telemetry_types: ["logs"]
3331

3432
exporters:

internal/pkg/otel/samples/linux/autoops_es.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ receivers:
2727
fields:
2828
temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID}
2929
token: ${env:AUTOOPS_TOKEN}
30-
output:
31-
otelconsumer:
3230
telemetry_types: ["logs"]
3331

3432
exporters:

internal/pkg/otel/samples/linux/autoops_es_debug.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ receivers:
2727
fields:
2828
temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID}
2929
token: ${env:AUTOOPS_TOKEN}
30-
output:
31-
otelconsumer:
3230
telemetry_types: ["logs"]
3331

3432
exporters:

internal/pkg/otel/samples/windows/autoops_es.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ receivers:
2727
fields:
2828
temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID}
2929
token: ${env:AUTOOPS_TOKEN}
30-
output:
31-
otelconsumer:
3230
telemetry_types: ["logs"]
3331

3432
exporters:

internal/pkg/otel/samples/windows/autoops_es_debug.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ receivers:
2727
fields:
2828
temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID}
2929
token: ${env:AUTOOPS_TOKEN}
30-
output:
31-
otelconsumer:
3230
telemetry_types: ["logs"]
3331

3432
exporters:

internal/pkg/otel/translate/otelconfig.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,6 @@ func getReceiversConfigForComponent(
271271
dataset := fmt.Sprintf("elastic_agent.%s", strings.ReplaceAll(strings.ReplaceAll(binaryName, "-", "_"), "/", "_"))
272272

273273
receiverConfig := map[string]any{
274-
// the output needs to be otelconsumer
275-
"output": map[string]any{
276-
"otelconsumer": map[string]any{},
277-
},
278274
// just like we do for beats processes, each receiver needs its own data path
279275
"path": map[string]any{
280276
"data": BeatDataPath(comp.ID),

internal/pkg/otel/translate/otelconfig_test.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -407,9 +407,6 @@ func TestGetOtelConfig(t *testing.T) {
407407
},
408408
},
409409
},
410-
"output": map[string]any{
411-
"otelconsumer": map[string]any{},
412-
},
413410
"path": map[string]any{
414411
"data": filepath.Join(paths.Run(), id),
415412
},
@@ -743,9 +740,6 @@ func TestGetOtelConfig(t *testing.T) {
743740
},
744741
},
745742
},
746-
"output": map[string]any{
747-
"otelconsumer": map[string]any{},
748-
},
749743
"path": map[string]any{
750744
"data": filepath.Join(paths.Run(), "beat-metrics-monitoring"),
751745
},
@@ -854,9 +848,6 @@ func TestGetOtelConfig(t *testing.T) {
854848
},
855849
},
856850
},
857-
"output": map[string]any{
858-
"otelconsumer": map[string]any{},
859-
},
860851
"path": map[string]any{
861852
"data": filepath.Join(paths.Run(), "system-metrics"),
862853
},
@@ -1106,7 +1097,6 @@ func TestGetReceiversConfigForComponent(t *testing.T) {
11061097
assert.True(t, ok, "receiver config should be a map")
11071098

11081099
// Verify configuration section presence
1109-
assert.Contains(t, receiverConfig, "output", "output config should be present")
11101100
assert.Contains(t, receiverConfig, "path", "path config should be present")
11111101
assert.Contains(t, receiverConfig, "logging", "logging config should be present")
11121102
assert.Contains(t, receiverConfig, tt.expectedBeatName, fmt.Sprintf("%s config should be present", tt.expectedBeatName))

testing/integration/ess/otel_test.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -832,8 +832,6 @@ func TestFileBeatReceiver(t *testing.T) {
832832
enabled: true
833833
count: 1
834834
message: {{.Message}}
835-
output:
836-
otelconsumer:
837835
logging:
838836
level: info
839837
selectors:
@@ -959,8 +957,6 @@ func TestOtelFBReceiverE2E(t *testing.T) {
959957
- {{.InputPath}}
960958
prospector.scanner.fingerprint.enabled: false
961959
file_identity.native: ~
962-
output:
963-
otelconsumer:
964960
logging:
965961
level: info
966962
selectors:
@@ -1384,8 +1380,6 @@ func TestOtelMBReceiverE2E(t *testing.T) {
13841380
- '.*'
13851381
metricsets:
13861382
- cpu
1387-
output:
1388-
otelconsumer:
13891383
logging:
13901384
level: info
13911385
selectors:
@@ -1574,8 +1568,6 @@ receivers:
15741568
fields:
15751569
dataset: generic
15761570
target: event
1577-
output:
1578-
otelconsumer:
15791571
logging:
15801572
level: info
15811573
selectors:
@@ -1812,8 +1804,6 @@ func TestFBOtelRestartE2E(t *testing.T) {
18121804
document_id: "id"
18131805
prospector.scanner.fingerprint.enabled: false
18141806
file_identity.native: ~
1815-
output:
1816-
otelconsumer:
18171807
logging:
18181808
level: info
18191809
selectors:
@@ -2049,8 +2039,6 @@ receivers:
20492039
- '.*'
20502040
metricsets:
20512041
- cpu
2052-
output:
2053-
otelconsumer:
20542042
queue.mem.flush.timeout: 0s
20552043
exporters:
20562044
elasticsearch/log:
@@ -2197,8 +2185,6 @@ receivers:
21972185
- '.*'
21982186
metricsets:
21992187
- cpu
2200-
output:
2201-
otelconsumer:
22022188
queue.mem.flush.timeout: 0s
22032189
exporters:
22042190
elasticsearch/log:

0 commit comments

Comments
 (0)