From 36c597db96b9d88bf2b661099c98e50855cc9db6 Mon Sep 17 00:00:00 2001 From: Felix Barnsteiner Date: Fri, 3 Jan 2025 13:32:48 +0100 Subject: [PATCH 1/4] Optimized index sorting for OTel logs --- .../main/resources/component-templates/logs-otel@mappings.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/x-pack/plugin/otel-data/src/main/resources/component-templates/logs-otel@mappings.yaml b/x-pack/plugin/otel-data/src/main/resources/component-templates/logs-otel@mappings.yaml index 5f4dcbd416720..428494eb7acc6 100644 --- a/x-pack/plugin/otel-data/src/main/resources/component-templates/logs-otel@mappings.yaml +++ b/x-pack/plugin/otel-data/src/main/resources/component-templates/logs-otel@mappings.yaml @@ -9,6 +9,9 @@ template: mode: logsdb sort: field: [ "resource.attributes.host.name", "@timestamp" ] + order: [ "desc", "desc" ] + mode: [ "min", "min" ] + missing: [ "_last", "_last" ] mappings: properties: attributes: From 0396db99a9d625ffc7a69f2834b7c87074ab9db1 Mon Sep 17 00:00:00 2001 From: Felix Barnsteiner Date: Fri, 3 Jan 2025 13:34:54 +0100 Subject: [PATCH 2/4] Update docs/changelog/119504.yaml --- docs/changelog/119504.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 docs/changelog/119504.yaml diff --git a/docs/changelog/119504.yaml b/docs/changelog/119504.yaml new file mode 100644 index 0000000000000..f63e422face10 --- /dev/null +++ b/docs/changelog/119504.yaml @@ -0,0 +1,5 @@ +pr: 119504 +summary: Optimized index sorting for OTel logs +area: Data streams +type: enhancement +issues: [] From 8c843f8da156a13c1731037eea7e84ca6c2009da Mon Sep 17 00:00:00 2001 From: Felix Barnsteiner Date: Fri, 3 Jan 2025 14:01:10 +0100 Subject: [PATCH 3/4] Remove sort.mode and sort.missing to fix LogsIndexModeEnabledRestTestIT.testLogsAtSettingWithTimeSeriesOverride I don't really get why you would want to set index.mode: time_series in logs@custom but these sort settings aren't compatible with tsdb --- .../main/resources/component-templates/logs-otel@mappings.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/x-pack/plugin/otel-data/src/main/resources/component-templates/logs-otel@mappings.yaml b/x-pack/plugin/otel-data/src/main/resources/component-templates/logs-otel@mappings.yaml index 428494eb7acc6..f62fc598a78c3 100644 --- a/x-pack/plugin/otel-data/src/main/resources/component-templates/logs-otel@mappings.yaml +++ b/x-pack/plugin/otel-data/src/main/resources/component-templates/logs-otel@mappings.yaml @@ -10,8 +10,6 @@ template: sort: field: [ "resource.attributes.host.name", "@timestamp" ] order: [ "desc", "desc" ] - mode: [ "min", "min" ] - missing: [ "_last", "_last" ] mappings: properties: attributes: From f798b2379a9e827482d1bf3ad3175f979c5e5833 Mon Sep 17 00:00:00 2001 From: Felix Barnsteiner Date: Tue, 7 Jan 2025 17:46:36 +0100 Subject: [PATCH 4/4] Sort host name asc --- .../main/resources/component-templates/logs-otel@mappings.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/plugin/otel-data/src/main/resources/component-templates/logs-otel@mappings.yaml b/x-pack/plugin/otel-data/src/main/resources/component-templates/logs-otel@mappings.yaml index f62fc598a78c3..0944c382b85e9 100644 --- a/x-pack/plugin/otel-data/src/main/resources/component-templates/logs-otel@mappings.yaml +++ b/x-pack/plugin/otel-data/src/main/resources/component-templates/logs-otel@mappings.yaml @@ -9,7 +9,7 @@ template: mode: logsdb sort: field: [ "resource.attributes.host.name", "@timestamp" ] - order: [ "desc", "desc" ] + order: [ "asc", "desc" ] mappings: properties: attributes: