Merge branch 'main' of https://github.com/elastic/elasticsearch into …

…112704_fix
astefan · Sep 19, 2024 · 4bdd904 · 4bdd904
2 parents aecd148 + e244216
commit 4bdd904
Show file tree

Hide file tree

Showing 16 changed files with 625 additions and 25 deletions.
diff --git a/docs/changelog/112706.yaml b/docs/changelog/112706.yaml
@@ -0,0 +1,5 @@
+pr: 112706
+summary: Configure keeping source in `FieldMapper`
+area: Mapping
+type: enhancement
+issues: []
diff --git a/...aRestTest/java/org/elasticsearch/datastreams/logsdb/qa/matchers/source/SourceMatcher.java b/...aRestTest/java/org/elasticsearch/datastreams/logsdb/qa/matchers/source/SourceMatcher.java
@@ -180,7 +180,9 @@ private Optional<MatchResult> matchWithFieldSpecificMatcher(String fieldName, Li
 
     // Checks for scenarios when source is stored exactly and therefore can be compared without special logic.
     private boolean sourceMatchesExactly(MappingTransforms.FieldMapping mapping, List<Object> expectedValues) {
-        return mapping.parentMappingParameters().stream().anyMatch(m -> m.getOrDefault("enabled", "true").equals("false"));
+        return mapping.parentMappingParameters().stream().anyMatch(m -> m.getOrDefault("enabled", "true").equals("false"))
+            || mapping.mappingParameters().getOrDefault("synthetic_source_keep", "none").equals("all")
+            || expectedValues.size() > 1 && mapping.mappingParameters().getOrDefault("synthetic_source_keep", "none").equals("arrays");
     }
 
     private MatchResult matchWithGenericMatcher(List<Object> actualValues, List<Object> expectedValues) {

diff --git a/muted-tests.yml b/muted-tests.yml
@@ -232,6 +232,12 @@ tests:
 - class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
   method: test {p0=indices.create/21_synthetic_source_stored/index param - nested array within array}
   issue: https://github.com/elastic/elasticsearch/issues/113173
+- class: org.elasticsearch.packaging.test.WindowsServiceTests
+  method: test33JavaChanged
+  issue: https://github.com/elastic/elasticsearch/issues/113177
+- class: org.elasticsearch.xpack.inference.rest.ServerSentEventsRestActionListenerTests
+  method: testErrorMidStream
+  issue: https://github.com/elastic/elasticsearch/issues/113179
 
 # Examples:
 #