Merge branch '8.19' into mergify/bp/8.19/pr-47804

Author: mauri870

libbeat/otelbeat/beatconverter/beatconverter.go

@@ -77,6 +77,12 @@ func (c Converter) Convert(_ context.Context, conf *confmap.Conf) error {
 			switch key {
 			case "elasticsearch":
 				esConfig := config.MustNewConfigFrom(output)
+
+				// ignore elasticsearch output if it is not enabled
+				if !esConfig.Enabled() {
+					continue
+				}
+
 				// we use development logger here as this method is part of dev-only otel command
 				logger, _ := logp.NewDevelopmentLogger("")
 				esOTelConfig, err := elasticsearchtranslate.ToOTelConfig(esConfig, logger)

libbeat/otelbeat/beatconverter/beatconverter_test.go

@@ -64,9 +64,9 @@ exporters:
       mode: bodymap
     compression: gzip
     compression_params:
-      level: 1 
+      level: 1
     auth:
-      authenticator: beatsauth  
+      authenticator: beatsauth
 `
 
 func TestConverter(t *testing.T) {
@@ -211,7 +211,7 @@ exporters:
       max_retries: 3
     user: elastic-cloud
     logs_dynamic_pipeline:
-      enabled: true    
+      enabled: true
     max_conns_per_host: 1
     sending_queue:
       batch:
@@ -230,7 +230,7 @@ exporters:
     compression_params:
       level: 1
     auth:
-      authenticator: beatsauth  
+      authenticator: beatsauth
 receivers:
   filebeatreceiver:
     filebeat:
@@ -326,6 +326,43 @@ service:
 		compareAndAssert(t, expOutput, input)
 
 	})
+
+	t.Run("test elasticsearch exporter with enabled false", func(t *testing.T) {
+		var supportedInput = `
+receivers:
+  filebeatreceiver:
+    output:
+      elasticsearch:
+        enabled: false
+        hosts: ["https://localhost:9200"]
+service:
+  pipelines:
+    logs:
+      receivers:
+        - "filebeatreceiver"
+`
+
+		var expectedOutput = `
+receivers:
+  filebeatreceiver:
+    output:
+      otelconsumer: null
+service:
+  telemetry:
+    metrics:
+      level: none
+  pipelines:
+    logs:
+      receivers:
+        - filebeatreceiver
+`
+		input := newFromYamlString(t, supportedInput)
+		err := c.Convert(context.Background(), input)
+		require.NoError(t, err, "error converting beats elasticsearch-output config")
+
+		expOutput := newFromYamlString(t, expectedOutput)
+		compareAndAssert(t, expOutput, input)
+	})
 }
 
 func TestLogLevel(t *testing.T) {
@@ -418,25 +455,25 @@ service:
   pipelines:
     logs:
       receivers:
-        - filebeatreceiver  
+        - filebeatreceiver
 `
 
 	commonOTelCfg := `
 extensions:
   beatsauth:
     idle_connection_timeout: 3s
     proxy_disable: false
-    timeout: 1m30s  
+    timeout: 1m30s
 receivers:
   filebeatreceiver:
     output:
-      otelconsumer: null    
+      otelconsumer: null
 exporters:
   elasticsearch:
     endpoints:
       - http://localhost:9200
     logs_dynamic_pipeline:
-      enabled: true      
+      enabled: true
     retry:
       enabled: true
       initial_interval: 1s
@@ -446,7 +483,7 @@ exporters:
     password: changeme
     user: elastic
     mapping:
-      mode: bodymap 
+      mode: bodymap
     compression: gzip
     compression_params:
       level: 1
@@ -473,7 +510,7 @@ service:
       exporters:
         - elasticsearch
       receivers:
-        - filebeatreceiver      
+        - filebeatreceiver
 `
 
 	tests := []struct {
@@ -490,7 +527,7 @@ receivers:
         events: 3200
         flush:
           min_events: 1600
-          timeout: 10s            
+          timeout: 10s
 extensions:
   beatsauth:
     idle_connection_timeout: 3s
@@ -502,7 +539,7 @@ exporters:
         max_size: 1600
       num_consumers: 1
       queue_size: 3200
-    max_conns_per_host: 1      
+    max_conns_per_host: 1
  `,
 		},
 		{
@@ -515,7 +552,7 @@ receivers:
         events: 12800
         flush:
           min_events: 1600
-          timeout: 5s           
+          timeout: 5s
 extensions:
   beatsauth:
     idle_connection_timeout: 15s
@@ -527,7 +564,7 @@ exporters:
         max_size: 1600
       num_consumers: 4
       queue_size: 12800
-    max_conns_per_host: 4      
+    max_conns_per_host: 4
 `,
 		},
 		{
@@ -540,7 +577,7 @@ receivers:
         events: 3200
         flush:
           min_events: 1600
-          timeout: 20s          
+          timeout: 20s
 extensions:
   beatsauth:
     idle_connection_timeout: 1s
@@ -555,7 +592,7 @@ exporters:
     max_conns_per_host: 1
     retry:
       initial_interval: 5s
-      max_interval: 5m0s       
+      max_interval: 5m0s
 `,
 		},
 		{
@@ -568,7 +605,7 @@ receivers:
         events: 4100
         flush:
           min_events: 2050
-          timeout: 1s          
+          timeout: 1s
 extensions:
   beatsauth:
     idle_connection_timeout: 1m0s
@@ -583,7 +620,7 @@ exporters:
     max_conns_per_host: 1
     retry:
       initial_interval: 1s
-      max_interval: 1m0s    
+      max_interval: 1m0s
 `}}
 
 	commonOTeMap := newFromYamlString(t, commonOTelCfg)