Add default sort for message.template_id field in logsdb indices #136571
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.logsdb.patterntext; | ||
|
|
||
| import org.elasticsearch.xpack.logsdb.DataStreamLicenseChangeTestCase; | ||
| import org.junit.Before; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
|
|
||
| import static org.hamcrest.Matchers.hasEntry; | ||
|
|
||
| public class PatternTextBasicLicenseIT extends DataStreamLicenseChangeTestCase { | ||
|
martijnvg marked this conversation as resolved.
|
||
| @Before | ||
| public void checkClusterFeature() { | ||
| assumeTrue("[patterned_text] must be available", clusterHasFeature("mapper.patterned_text")); | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| public void testStandardIndex() throws IOException { | ||
| final String dataStreamName = "test-foo"; | ||
|
|
||
| final String mappingStr = """ | ||
| { | ||
| "index_patterns": ["%name%"], | ||
| "priority": 500, | ||
| "data_stream": {}, | ||
| "template": { | ||
| "mappings": { | ||
| "properties": { | ||
| "pattern_field": { | ||
| "type": "pattern_text" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }"""; | ||
|
|
||
| final String doc = """ | ||
| {"index": {}} | ||
| {"@timestamp": "2025-01-01T00:00:00.000Z", "pattern_field": "foo"} | ||
| """; | ||
|
|
||
| assertOK(putTemplate(client(), "logs@custom", mappingStr.replace("%name%", dataStreamName))); | ||
| assertOK(bulkIndex(client(), dataStreamName, () -> doc)); | ||
|
|
||
| String backingIndex0 = getDataStreamBackingIndex(client(), dataStreamName, 0); | ||
| { | ||
| assertEquals("true", getSetting(client(), backingIndex0, "index.mapping.pattern_text.disable_templating")); | ||
| Map<String, Object> mapping = getMapping(client(), backingIndex0); | ||
| Map<String, Object> patternFieldMapping = (Map<String, Object>) ((Map<String, Object>) mapping.get("properties")).get( | ||
| "pattern_field" | ||
| ); | ||
| assertThat(patternFieldMapping, hasEntry("disable_templating", true)); | ||
| } | ||
|
|
||
| assertOK(rolloverDataStream(client(), dataStreamName)); | ||
|
|
||
| String backingIndex1 = getDataStreamBackingIndex(client(), dataStreamName, 1); | ||
| { | ||
| assertEquals("true", getSetting(client(), backingIndex1, "index.mapping.pattern_text.disable_templating")); | ||
| Map<String, Object> mapping = getMapping(client(), backingIndex1); | ||
| Map<String, Object> patternFieldMapping = (Map<String, Object>) ((Map<String, Object>) mapping.get("properties")).get( | ||
| "pattern_field" | ||
| ); | ||
| assertThat(patternFieldMapping, hasEntry("disable_templating", true)); | ||
| } | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
|
Member
There was a problem hiding this comment. nit: add the supress warning to the places where it is needed? For example: @SuppressWarnings("unchecked")
Map<String, Object> mapping = getMapping(client(), backingIndex0);
@SuppressWarnings("unchecked")
Map<String, Object> patternFieldMapping = (Map<String, Object>) ((Map<String, Object>) mapping.get("properties")).get(
"message"
);
Contributor
Author
There was a problem hiding this comment. Oops, yep I just added the whole-function SuppressWarnings just while I was developing the test and I meant to move it to the specific line, but it slipped my mind |
||
| public void testLogsdbIndex() throws IOException { | ||
| final String dataStreamName = "test-bar"; | ||
|
|
||
| final String mappingStr = """ | ||
| { | ||
| "index_patterns": ["%name%"], | ||
| "priority": 500, | ||
| "data_stream": {}, | ||
| "template": { | ||
| "settings": { | ||
| "index.mode": "logsdb" | ||
| }, | ||
| "mappings": { | ||
| "properties": { | ||
| "@timestamp": { | ||
| "type": "date" | ||
| }, | ||
| "message": { | ||
| "type": "pattern_text" | ||
| }, | ||
| "host.name": { | ||
| "type": "keyword" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| """; | ||
|
|
||
| final String doc = """ | ||
| {"index": {}} | ||
| {"@timestamp": "2025-01-01T00:00:00.000Z", "message": "foo 123", "host.name": "bar"} | ||
| """; | ||
|
|
||
| assertOK(putTemplate(client(), "logs@custom", mappingStr.replace("%name%", dataStreamName))); | ||
| assertOK(bulkIndex(client(), dataStreamName, () -> doc)); | ||
|
|
||
| String backingIndex0 = getDataStreamBackingIndex(client(), dataStreamName, 0); | ||
| { | ||
| assertEquals("true", getSetting(client(), backingIndex0, "index.mapping.pattern_text.disable_templating")); | ||
| assertEquals( | ||
| List.of("host.name", "message.template_id", "@timestamp"), | ||
| getSetting(client(), backingIndex0, "index.sort.field") | ||
| ); | ||
| Map<String, Object> mapping = getMapping(client(), backingIndex0); | ||
| Map<String, Object> patternFieldMapping = (Map<String, Object>) ((Map<String, Object>) mapping.get("properties")).get( | ||
| "message" | ||
| ); | ||
| assertThat(patternFieldMapping, hasEntry("disable_templating", true)); | ||
| } | ||
|
|
||
| assertOK(rolloverDataStream(client(), dataStreamName)); | ||
|
|
||
| String backingIndex1 = getDataStreamBackingIndex(client(), dataStreamName, 1); | ||
| { | ||
| assertEquals("true", getSetting(client(), backingIndex1, "index.mapping.pattern_text.disable_templating")); | ||
| assertEquals( | ||
| List.of("host.name", "message.template_id", "@timestamp"), | ||
| getSetting(client(), backingIndex1, "index.sort.field") | ||
| ); | ||
| Map<String, Object> mapping = getMapping(client(), backingIndex1); | ||
| Map<String, Object> patternFieldMapping = (Map<String, Object>) ((Map<String, Object>) mapping.get("properties")).get( | ||
| "message" | ||
| ); | ||
| assertThat(patternFieldMapping, hasEntry("disable_templating", true)); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.