Skip to content

Commit eed8da3

Browse files
rjernstrjernst
authored
Move the ingest attachment processor to the default distribution (#87989)
The ingest attachment processor is currently available as a plugin. This commit moves the processor to the default distribution so it is always available.
1 parent 1cef841 commit eed8da3

364 files changed

Lines changed: 70 additions & 77 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎benchmarks/src/main/resources/org/elasticsearch/benchmark/xcontent/monitor_cluster_stats.json‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -298,16 +298,6 @@
298298
"extended_plugins" : [ ],
299299
"has_native_controller" : false
300300
},
301-
{
302-
"name" : "ingest-attachment",
303-
"version" : "7.10.0",
304-
"elasticsearch_version" : "7.10.0",
305-
"java_version" : "1.8",
306-
"description" : "Ingest processor that uses Apache Tika to extract contents",
307-
"classname" : "org.elasticsearch.ingest.attachment.IngestAttachmentPlugin",
308-
"extended_plugins" : [ ],
309-
"has_native_controller" : false
310-
},
311301
{
312302
"name" : "mapper-murmur3",
313303
"version" : "7.10.0",

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ netty = 4.1.77.Final
2424
commons_lang3 = 3.9
2525

2626
# when updating this version, you need to ensure compatibility with:
27-
# - plugins/ingest-attachment (transitive dependency, check the upstream POM)
27+
# - modules/ingest-attachment (transitive dependency, check the upstream POM)
2828
# - distribution/tools/plugin-cli
2929
# - x-pack/plugin/security
3030
bouncycastle=1.64

‎distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/InstallPluginAction.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,12 @@ public class InstallPluginAction implements Closeable {
159159
* maintained so that existing user workflows that install these plugins do not need to be updated
160160
* immediately.
161161
*/
162-
public static final Set<String> PLUGINS_CONVERTED_TO_MODULES = Set.of("repository-azure", "repository-gcs", "repository-s3");
162+
public static final Set<String> PLUGINS_CONVERTED_TO_MODULES = Set.of(
163+
"repository-azure",
164+
"repository-gcs",
165+
"repository-s3",
166+
"ingest-attachment"
167+
);
163168

164169
static final Set<PosixFilePermission> BIN_DIR_PERMS;
165170
static final Set<PosixFilePermission> BIN_FILES_PERMS;

‎distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/InstallPluginActionTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1503,7 +1503,7 @@ public void testMultipleJars() throws Exception {
15031503
* instead simply print a message to the terminal.
15041504
*/
15051505
public void testInstallMigratedPlugins() throws Exception {
1506-
for (String id : List.of("repository-azure", "repository-gcs", "repository-s3")) {
1506+
for (String id : List.of("repository-azure", "repository-gcs", "repository-s3", "ingest-attachment")) {
15071507
installPlugin(id);
15081508
assertThat(terminal.getErrorOutput(), containsString("[" + id + "] is no longer a plugin"));
15091509
}

‎docs/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ ext.docsFileTree = fileTree(projectDir) {
2525
// Broken code snippet tests
2626
exclude 'reference/graph/explore.asciidoc'
2727
if (BuildParams.inFipsJvm) {
28-
// We don't install/support this plugin in FIPS 140
29-
exclude 'plugins/ingest-attachment.asciidoc'
30-
// We can't conditionally control output, this would be missing the ingest-attachment plugin
28+
// We don't support this component in FIPS 140
29+
exclude 'reference/ingest/processors/attachment.asciidoc'
30+
// We can't conditionally control output, this would be missing the ingest-attachment component
3131
exclude 'reference/cat/plugins.asciidoc'
3232
}
3333
}
@@ -105,7 +105,7 @@ testClusters.matching { it.name == "yamlRestTest"}.configureEach {
105105
return
106106
}
107107
// Do not install ingest-attachment in a FIPS 140 JVM as this is not supported
108-
if (subproj.path.startsWith(':plugins:ingest-attachment') && BuildParams.inFipsJvm) {
108+
if (subproj.path.startsWith(':modules:ingest-attachment') && BuildParams.inFipsJvm) {
109109
return
110110
}
111111
plugin subproj.path

‎docs/changelog/87989.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 87989
2+
summary: Move the ingest attachment processor to the default distribution
3+
area: Ingest
4+
type: enhancement
5+
issues: []

‎docs/plugins/index.asciidoc‎

Lines changed: 0 additions & 2 deletions

‎docs/plugins/ingest.asciidoc‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎docs/plugins/redirects.asciidoc‎

Lines changed: 14 additions & 0 deletions

‎docs/reference/cat/plugins.asciidoc‎

Lines changed: 2 additions & 3 deletions

0 commit comments

Comments
 (0)