Skip to content

Commit d55329f

Browse files
Fix logsdb settings provider mapping filters (#136119) (#136200)
Fixes #136107 (cherry picked from commit d513723) # Conflicts: # x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java # x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java # x-pack/plugin/logsdb/src/yamlRestTest/resources/rest-api-spec/test/30_logsdb_default_mapping.yml
1 parent 1fe36ee commit d55329f

File tree

4 files changed

+229
-192
lines changed

4 files changed

+229
-192
lines changed

docs/changelog/136119.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 136119
2+
summary: Fix logsdb settings provider mapping filters
3+
area: Logs
4+
type: bug
5+
issues:
6+
- 136107

x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,19 @@
4242
import java.util.Locale;
4343
import java.util.Set;
4444
import java.util.function.Supplier;
45+
import java.util.stream.Collectors;
46+
import java.util.stream.Stream;
4547

4648
import static org.elasticsearch.cluster.metadata.IndexMetadata.INDEX_ROUTING_PATH;
4749
import static org.elasticsearch.xpack.logsdb.LogsDBPlugin.CLUSTER_LOGSDB_ENABLED;
4850

4951
final class LogsdbIndexModeSettingsProvider implements IndexSettingProvider {
5052
private static final Logger LOGGER = LogManager.getLogger(LogsdbIndexModeSettingsProvider.class);
5153
static final String LOGS_PATTERN = "logs-*-*";
52-
private static final Set<String> MAPPING_INCLUDES = Set.of("_doc._source.*", "_doc.properties.host**", "_doc.subobjects");
54+
private static final Set<String> MAPPING_INCLUDES = Set.of("_source.*", "properties.host**", "subobjects")
55+
.stream()
56+
.flatMap(v -> Stream.of(v, "_doc." + v))
57+
.collect(Collectors.toSet());
5358

5459
private final LogsdbLicenseService licenseService;
5560
private final SetOnce<CheckedFunction<IndexMetadata, MapperService, IOException>> mapperServiceFactory = new SetOnce<>();

0 commit comments

Comments
 (0)