diff --git a/docs/hybrid-agent-beats-receivers.md b/docs/hybrid-agent-beats-receivers.md index 28569807f87..6d0623a59ab 100644 --- a/docs/hybrid-agent-beats-receivers.md +++ b/docs/hybrid-agent-beats-receivers.md @@ -155,8 +155,6 @@ receivers: paths: - /var/log/*.log type: filestream - output: - otelconsumer: {} metricbeatreceiver: metricbeat: modules: @@ -166,8 +164,6 @@ receivers: metricsets: - cpu module: system - output: - otelconsumer: {} exporters: elasticsearch/_agent-component/default: api_key: placeholder diff --git a/internal/pkg/otel/samples/darwin/autoops_es.yml b/internal/pkg/otel/samples/darwin/autoops_es.yml index 521c760f3dd..62c4bb6f461 100644 --- a/internal/pkg/otel/samples/darwin/autoops_es.yml +++ b/internal/pkg/otel/samples/darwin/autoops_es.yml @@ -27,8 +27,6 @@ receivers: fields: temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID} token: ${env:AUTOOPS_TOKEN} - output: - otelconsumer: telemetry_types: ["logs"] exporters: diff --git a/internal/pkg/otel/samples/darwin/autoops_es_debug.yml b/internal/pkg/otel/samples/darwin/autoops_es_debug.yml index d022a62967c..1d8d6afb82f 100644 --- a/internal/pkg/otel/samples/darwin/autoops_es_debug.yml +++ b/internal/pkg/otel/samples/darwin/autoops_es_debug.yml @@ -27,8 +27,6 @@ receivers: fields: temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID} token: ${env:AUTOOPS_TOKEN} - output: - otelconsumer: telemetry_types: ["logs"] exporters: diff --git a/internal/pkg/otel/samples/linux/autoops_es.yml b/internal/pkg/otel/samples/linux/autoops_es.yml index 521c760f3dd..62c4bb6f461 100644 --- a/internal/pkg/otel/samples/linux/autoops_es.yml +++ b/internal/pkg/otel/samples/linux/autoops_es.yml @@ -27,8 +27,6 @@ receivers: fields: temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID} token: ${env:AUTOOPS_TOKEN} - output: - otelconsumer: telemetry_types: ["logs"] exporters: diff --git a/internal/pkg/otel/samples/linux/autoops_es_debug.yml b/internal/pkg/otel/samples/linux/autoops_es_debug.yml index d022a62967c..1d8d6afb82f 100644 --- a/internal/pkg/otel/samples/linux/autoops_es_debug.yml +++ b/internal/pkg/otel/samples/linux/autoops_es_debug.yml @@ -27,8 +27,6 @@ receivers: fields: temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID} token: ${env:AUTOOPS_TOKEN} - output: - otelconsumer: telemetry_types: ["logs"] exporters: diff --git a/internal/pkg/otel/samples/windows/autoops_es.yml b/internal/pkg/otel/samples/windows/autoops_es.yml index 521c760f3dd..62c4bb6f461 100644 --- a/internal/pkg/otel/samples/windows/autoops_es.yml +++ b/internal/pkg/otel/samples/windows/autoops_es.yml @@ -27,8 +27,6 @@ receivers: fields: temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID} token: ${env:AUTOOPS_TOKEN} - output: - otelconsumer: telemetry_types: ["logs"] exporters: diff --git a/internal/pkg/otel/samples/windows/autoops_es_debug.yml b/internal/pkg/otel/samples/windows/autoops_es_debug.yml index d022a62967c..1d8d6afb82f 100644 --- a/internal/pkg/otel/samples/windows/autoops_es_debug.yml +++ b/internal/pkg/otel/samples/windows/autoops_es_debug.yml @@ -27,8 +27,6 @@ receivers: fields: temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID} token: ${env:AUTOOPS_TOKEN} - output: - otelconsumer: telemetry_types: ["logs"] exporters: diff --git a/internal/pkg/otel/translate/otelconfig.go b/internal/pkg/otel/translate/otelconfig.go index 0472445a270..73af552703b 100644 --- a/internal/pkg/otel/translate/otelconfig.go +++ b/internal/pkg/otel/translate/otelconfig.go @@ -271,10 +271,6 @@ func getReceiversConfigForComponent( dataset := fmt.Sprintf("elastic_agent.%s", strings.ReplaceAll(strings.ReplaceAll(binaryName, "-", "_"), "/", "_")) receiverConfig := map[string]any{ - // the output needs to be otelconsumer - "output": map[string]any{ - "otelconsumer": map[string]any{}, - }, // just like we do for beats processes, each receiver needs its own data path "path": map[string]any{ "data": BeatDataPath(comp.ID), diff --git a/internal/pkg/otel/translate/otelconfig_test.go b/internal/pkg/otel/translate/otelconfig_test.go index 874e1545e48..5c34862f0e4 100644 --- a/internal/pkg/otel/translate/otelconfig_test.go +++ b/internal/pkg/otel/translate/otelconfig_test.go @@ -407,9 +407,6 @@ func TestGetOtelConfig(t *testing.T) { }, }, }, - "output": map[string]any{ - "otelconsumer": map[string]any{}, - }, "path": map[string]any{ "data": filepath.Join(paths.Run(), id), }, @@ -743,9 +740,6 @@ func TestGetOtelConfig(t *testing.T) { }, }, }, - "output": map[string]any{ - "otelconsumer": map[string]any{}, - }, "path": map[string]any{ "data": filepath.Join(paths.Run(), "beat-metrics-monitoring"), }, @@ -854,9 +848,6 @@ func TestGetOtelConfig(t *testing.T) { }, }, }, - "output": map[string]any{ - "otelconsumer": map[string]any{}, - }, "path": map[string]any{ "data": filepath.Join(paths.Run(), "system-metrics"), }, @@ -1106,7 +1097,6 @@ func TestGetReceiversConfigForComponent(t *testing.T) { assert.True(t, ok, "receiver config should be a map") // Verify configuration section presence - assert.Contains(t, receiverConfig, "output", "output config should be present") assert.Contains(t, receiverConfig, "path", "path config should be present") assert.Contains(t, receiverConfig, "logging", "logging config should be present") assert.Contains(t, receiverConfig, tt.expectedBeatName, fmt.Sprintf("%s config should be present", tt.expectedBeatName)) diff --git a/testing/integration/ess/otel_test.go b/testing/integration/ess/otel_test.go index a0cc1e2333b..077d7059f7e 100644 --- a/testing/integration/ess/otel_test.go +++ b/testing/integration/ess/otel_test.go @@ -832,8 +832,6 @@ func TestFileBeatReceiver(t *testing.T) { enabled: true count: 1 message: {{.Message}} - output: - otelconsumer: logging: level: info selectors: @@ -959,8 +957,6 @@ func TestOtelFBReceiverE2E(t *testing.T) { - {{.InputPath}} prospector.scanner.fingerprint.enabled: false file_identity.native: ~ - output: - otelconsumer: logging: level: info selectors: @@ -1384,8 +1380,6 @@ func TestOtelMBReceiverE2E(t *testing.T) { - '.*' metricsets: - cpu - output: - otelconsumer: logging: level: info selectors: @@ -1574,8 +1568,6 @@ receivers: fields: dataset: generic target: event - output: - otelconsumer: logging: level: info selectors: @@ -1812,8 +1804,6 @@ func TestFBOtelRestartE2E(t *testing.T) { document_id: "id" prospector.scanner.fingerprint.enabled: false file_identity.native: ~ - output: - otelconsumer: logging: level: info selectors: @@ -2049,8 +2039,6 @@ receivers: - '.*' metricsets: - cpu - output: - otelconsumer: queue.mem.flush.timeout: 0s exporters: elasticsearch/log: @@ -2197,8 +2185,6 @@ receivers: - '.*' metricsets: - cpu - output: - otelconsumer: queue.mem.flush.timeout: 0s exporters: elasticsearch/log: diff --git a/testing/integration/k8s/testdata/journald-otel.yml b/testing/integration/k8s/testdata/journald-otel.yml index 1e365cd9639..a5180870d04 100644 --- a/testing/integration/k8s/testdata/journald-otel.yml +++ b/testing/integration/k8s/testdata/journald-otel.yml @@ -8,8 +8,6 @@ receivers: - /opt/journal/ merge: true - output: - otelconsumer: logging: level: debug selectors: