[8.19] (backport #8592) Remove deprecated otel elasticsearch exporter config *_dynamic_index

changelog/fragments/1750349806-elasticsearchexporter-deprecated-config.yaml

@@ -0,0 +1,32 @@
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: enhancement
+
+# Change summary; a 80ish characters long description of the change.
+summary: Remove deprecated otel elasticsearch exporter config `*_dynamic_index` from code and samples
+
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
+#description:
+
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: elastic-agent
+
+# PR URL; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+pr: https://github.com/elastic/elastic-agent/pull/8592
+
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+#issue: https://github.com/owner/repo/1234

deploy/helm/edot-collector/kube-stack/values.yaml

@@ -610,12 +610,6 @@ collectors:
           endpoints: # List of Elasticsearch endpoints.
             - ${env:ELASTIC_ENDPOINT}
           api_key: ${env:ELASTIC_API_KEY} # API key for Elasticsearch authentication.
-          logs_dynamic_index:
-            enabled: true
-          metrics_dynamic_index:
-            enabled: true
-          traces_dynamic_index:
-            enabled: true
           # Enable in order to skip the SSL certificate Check
           # tls:
           #   insecure_skip_verify: true

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

@@ -99,24 +99,12 @@ exporters:
     api_key: ${env:ELASTIC_API_KEY}
     mapping:
       mode: ecs
-    logs_dynamic_index:
-      enabled: true
-    metrics_dynamic_index:
-      enabled: true
-    traces_dynamic_index:
-      enabled: true
 
   elasticsearch/otel:
     endpoints: [ "${env:ELASTIC_ENDPOINT}" ]
     api_key: ${env:ELASTIC_API_KEY}
     mapping:
       mode: otel
-    logs_dynamic_index:
-      enabled: true
-    metrics_dynamic_index:
-      enabled: true
-    traces_dynamic_index:
-      enabled: true
 
 service:
   extensions: [file_storage]

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

@@ -58,12 +58,6 @@ exporters:
     api_key: ${env:ELASTIC_API_KEY}
     mapping:
       mode: otel
-    logs_dynamic_index:
-      enabled: true
-    metrics_dynamic_index:
-      enabled: true
-    traces_dynamic_index:
-      enabled: true
 
 service:
   extensions: [file_storage]

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

@@ -90,23 +90,11 @@ exporters:
     api_key: ${env:ELASTIC_API_KEY}
     mapping:
       mode: ecs
-    logs_dynamic_index:
-      enabled: true
-    metrics_dynamic_index:
-      enabled: true
-    traces_dynamic_index:
-      enabled: true
   elasticsearch/otel:
     endpoints: [ "${env:ELASTIC_ENDPOINT}" ]
     api_key: ${env:ELASTIC_API_KEY}
     mapping:
       mode: otel
-    logs_dynamic_index:
-      enabled: true
-    metrics_dynamic_index:
-      enabled: true
-    traces_dynamic_index:
-      enabled: true
 
 service:
   extensions: [file_storage]

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

@@ -49,12 +49,6 @@ exporters:
     endpoints:
       - ${ELASTIC_ENDPOINT} # Will be populated from environment variable
     api_key: ${ELASTIC_API_KEY} # Will be populated from environment variable
-    logs_dynamic_index:
-      enabled: true
-    metrics_dynamic_index:
-      enabled: true
-    traces_dynamic_index:
-      enabled: true
     # tls:
     #   insecure_skip_verify: true
     mapping:

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

@@ -106,24 +106,12 @@ exporters:
     api_key: ${env:ELASTIC_API_KEY}
     mapping:
       mode: ecs
-    logs_dynamic_index:
-      enabled: true
-    metrics_dynamic_index:
-      enabled: true
-    traces_dynamic_index:
-      enabled: true
 
   elasticsearch/otel:
     endpoints: [ "${env:ELASTIC_ENDPOINT}" ]
     api_key: ${env:ELASTIC_API_KEY}
     mapping:
       mode: otel
-    logs_dynamic_index:
-      enabled: true
-    metrics_dynamic_index:
-      enabled: true
-    traces_dynamic_index:
-      enabled: true
 
 service:
   extensions: [file_storage]

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

@@ -58,12 +58,6 @@ exporters:
     api_key: ${env:ELASTIC_API_KEY}
     mapping:
       mode: otel
-    logs_dynamic_index:
-      enabled: true
-    metrics_dynamic_index:
-      enabled: true
-    traces_dynamic_index:
-      enabled: true
 
 service:
   extensions: [file_storage]

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

@@ -97,23 +97,11 @@ exporters:
     api_key: ${env:ELASTIC_API_KEY}
     mapping:
       mode: ecs
-    logs_dynamic_index:
-      enabled: true
-    metrics_dynamic_index:
-      enabled: true
-    traces_dynamic_index:
-      enabled: true
   elasticsearch/otel:
     endpoints: [ "${env:ELASTIC_ENDPOINT}" ]
     api_key: ${env:ELASTIC_API_KEY}
     mapping:
       mode: otel
-    logs_dynamic_index:
-      enabled: true
-    metrics_dynamic_index:
-      enabled: true
-    traces_dynamic_index:
-      enabled: true
 
 service:
   extensions: [file_storage]

internal/pkg/otel/translate/otelconfig.go

@@ -400,9 +400,7 @@ func translateEsOutputToExporter(cfg *config.C) (map[string]any, error) {
 	if err != nil {
 		return nil, err
 	}
-	// we want to use dynamic indexing
-	esConfig["logs_index"] = "" // needs to be empty for logs_dynamic_index
-	esConfig["logs_dynamic_index"] = map[string]any{"enabled": true}
+	// dynamic indexing works by default
 
 	// we also want to use dynamic log ids
 	esConfig["logs_dynamic_id"] = map[string]any{"enabled": true}

internal/pkg/otel/translate/otelconfig_test.go

@@ -222,7 +222,6 @@ func TestGetOtelConfig(t *testing.T) {
 				"max_size": 1600,
 				"min_size": 0,
 			},
-			"logs_index": "",
 			"mapping": map[string]any{
 				"mode": "bodymap",
 			},
@@ -235,9 +234,6 @@ func TestGetOtelConfig(t *testing.T) {
 				"max_interval":     1 * time.Minute,
 				"max_retries":      3,
 			},
-			"logs_dynamic_index": map[string]any{
-				"enabled": true,
-			},
 			"logs_dynamic_id": map[string]any{
 				"enabled": true,
 			},