Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions docs/hybrid-agent-beats-receivers.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,6 @@ receivers:
paths:
- /var/log/*.log
type: filestream
output:
otelconsumer: {}
metricbeatreceiver:
metricbeat:
modules:
Expand All @@ -166,8 +164,6 @@ receivers:
metricsets:
- cpu
module: system
output:
otelconsumer: {}
exporters:
elasticsearch/_agent-component/default:
api_key: placeholder
Expand Down
2 changes: 0 additions & 2 deletions internal/pkg/otel/samples/darwin/autoops_es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ receivers:
fields:
temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID}
token: ${env:AUTOOPS_TOKEN}
output:
otelconsumer:
telemetry_types: ["logs"]

exporters:
Expand Down
2 changes: 0 additions & 2 deletions internal/pkg/otel/samples/darwin/autoops_es_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ receivers:
fields:
temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID}
token: ${env:AUTOOPS_TOKEN}
output:
otelconsumer:
telemetry_types: ["logs"]

exporters:
Expand Down
2 changes: 0 additions & 2 deletions internal/pkg/otel/samples/linux/autoops_es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ receivers:
fields:
temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID}
token: ${env:AUTOOPS_TOKEN}
output:
otelconsumer:
telemetry_types: ["logs"]

exporters:
Expand Down
2 changes: 0 additions & 2 deletions internal/pkg/otel/samples/linux/autoops_es_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ receivers:
fields:
temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID}
token: ${env:AUTOOPS_TOKEN}
output:
otelconsumer:
telemetry_types: ["logs"]

exporters:
Expand Down
2 changes: 0 additions & 2 deletions internal/pkg/otel/samples/windows/autoops_es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ receivers:
fields:
temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID}
token: ${env:AUTOOPS_TOKEN}
output:
otelconsumer:
telemetry_types: ["logs"]

exporters:
Expand Down
2 changes: 0 additions & 2 deletions internal/pkg/otel/samples/windows/autoops_es_debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ receivers:
fields:
temp_resource_id: ${env:AUTOOPS_TEMP_RESOURCE_ID}
token: ${env:AUTOOPS_TOKEN}
output:
otelconsumer:
telemetry_types: ["logs"]

exporters:
Expand Down
4 changes: 0 additions & 4 deletions internal/pkg/otel/translate/otelconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
10 changes: 0 additions & 10 deletions internal/pkg/otel/translate/otelconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
Expand Down Expand Up @@ -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"),
},
Expand Down Expand Up @@ -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"),
},
Expand Down Expand Up @@ -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))
Expand Down
14 changes: 0 additions & 14 deletions testing/integration/ess/otel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -832,8 +832,6 @@ func TestFileBeatReceiver(t *testing.T) {
enabled: true
count: 1
message: {{.Message}}
output:
otelconsumer:
logging:
level: info
selectors:
Expand Down Expand Up @@ -959,8 +957,6 @@ func TestOtelFBReceiverE2E(t *testing.T) {
- {{.InputPath}}
prospector.scanner.fingerprint.enabled: false
file_identity.native: ~
output:
otelconsumer:
logging:
level: info
selectors:
Expand Down Expand Up @@ -1384,8 +1380,6 @@ func TestOtelMBReceiverE2E(t *testing.T) {
- '.*'
metricsets:
- cpu
output:
otelconsumer:
logging:
level: info
selectors:
Expand Down Expand Up @@ -1574,8 +1568,6 @@ receivers:
fields:
dataset: generic
target: event
output:
otelconsumer:
logging:
level: info
selectors:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -2049,8 +2039,6 @@ receivers:
- '.*'
metricsets:
- cpu
output:
otelconsumer:
queue.mem.flush.timeout: 0s
exporters:
elasticsearch/log:
Expand Down Expand Up @@ -2197,8 +2185,6 @@ receivers:
- '.*'
metricsets:
- cpu
output:
otelconsumer:
queue.mem.flush.timeout: 0s
exporters:
elasticsearch/log:
Expand Down
2 changes: 0 additions & 2 deletions testing/integration/k8s/testdata/journald-otel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ receivers:
- /opt/journal/
merge: true

output:
otelconsumer:
logging:
level: debug
selectors:
Expand Down
Loading