diff --git a/docs/changelog/138265.yaml b/docs/changelog/138265.yaml new file mode 100644 index 0000000000000..1125a510e7254 --- /dev/null +++ b/docs/changelog/138265.yaml @@ -0,0 +1,5 @@ +pr: 138265 +summary: Fix `index.mapping.pattern_text.disable_templating` not registered issue +area: Mapping +type: bug +issues: [] diff --git a/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/PatternTextRollingUpgradeIT.java b/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/PatternTextRollingUpgradeIT.java new file mode 100644 index 0000000000000..c3ae6ca268cbb --- /dev/null +++ b/x-pack/plugin/logsdb/qa/rolling-upgrade/src/javaRestTest/java/org/elasticsearch/upgrades/PatternTextRollingUpgradeIT.java @@ -0,0 +1,30 @@ +/* + * 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", the "GNU Affero General Public License v3.0 only", and the "Server Side + * Public License v 1"; you may not use this file except in compliance with, at + * your election, the "Elastic License 2.0", the "GNU Affero General Public + * License v3.0 only", or the "Server Side Public License, v 1". + */ + +package org.elasticsearch.upgrades; + +import com.carrotsearch.randomizedtesting.annotations.Name; + +public class PatternTextRollingUpgradeIT extends AbstractStringTypeRollingUpgradeIT { + + public PatternTextRollingUpgradeIT(@Name("upgradedNodes") int upgradedNodes) { + super(upgradedNodes); + } + + @Override + public String stringType() { + return "pattern_text"; + } + + @Override + protected void testIndexing(boolean shouldIncludeKeywordMultiField) throws Exception { + assumeTrue("pattern_text only available from 9.2.0 onward", oldClusterHasFeature("gte_v9.2.0")); + super.testIndexing(shouldIncludeKeywordMultiField); + } +} diff --git a/x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextFieldMapper.java b/x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextFieldMapper.java index 06e76751460f1..204c87d069aa6 100644 --- a/x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextFieldMapper.java +++ b/x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/patterntext/PatternTextFieldMapper.java @@ -168,7 +168,7 @@ private static Parameter analyzerParam(String name, Function disableTemplatingParameter(IndexSettings indexSettings) { - boolean forceDisable = indexSettings.getValue(DISABLE_TEMPLATING_SETTING); + boolean forceDisable = DISABLE_TEMPLATING_SETTING.get(indexSettings.getSettings()); return Parameter.boolParam( "disable_templating", false,