Skip to content

Commit 421f58e

Browse files
authored
Remove discovery-file plugin (#33257)
In #33241 we moved the file-based discovery functionality to core Elasticsearch, but preserved the `discovery-file` plugin, and support for the existing location of the `unicast_hosts.txt` file, for BWC reasons. This commit completes the removal of this plugin.
1 parent 9543992 commit 421f58e

File tree

13 files changed

+19
-309
lines changed

13 files changed

+19
-309
lines changed

docs/plugins/discovery-file.asciidoc

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

docs/plugins/discovery.asciidoc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ The Azure Classic discovery plugin uses the Azure Classic API for unicast discov
2121

2222
The Google Compute Engine discovery plugin uses the GCE API for unicast discovery.
2323

24-
<<discovery-file,File-based discovery>>::
25-
26-
The File-based discovery plugin allows providing the unicast hosts list through a dynamically updatable file.
27-
2824
[float]
2925
==== Community contributed discovery plugins
3026

@@ -38,5 +34,3 @@ include::discovery-ec2.asciidoc[]
3834
include::discovery-azure-classic.asciidoc[]
3935

4036
include::discovery-gce.asciidoc[]
41-
42-
include::discovery-file.asciidoc[]

docs/reference/cat/plugins.asciidoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ U7321H6 analysis-stempel {version} The Stempel (Polish) Analysis plugin i
2323
U7321H6 analysis-ukrainian {version} The Ukrainian Analysis plugin integrates the Lucene UkrainianMorfologikAnalyzer into elasticsearch.
2424
U7321H6 discovery-azure-classic {version} The Azure Classic Discovery plugin allows to use Azure Classic API for the unicast discovery mechanism
2525
U7321H6 discovery-ec2 {version} The EC2 discovery plugin allows to use AWS API for the unicast discovery mechanism.
26-
U7321H6 discovery-file {version} Discovery file plugin enables unicast discovery from hosts stored in a file.
2726
U7321H6 discovery-gce {version} The Google Compute Engine (GCE) Discovery plugin allows to use GCE API for the unicast discovery mechanism.
2827
U7321H6 ingest-attachment {version} Ingest processor that uses Apache Tika to extract contents
2928
U7321H6 ingest-geoip {version} Ingest processor that uses looksup geo data based on ip adresses using the Maxmind geo database

docs/reference/migration/migrate_7_0/plugins.asciidoc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,12 @@ See {plugins}/repository-gcs-client.html#repository-gcs-client[Google Cloud Stor
2222
==== Analysis Plugin changes
2323

2424
* The misspelled helper method `requriesAnalysisSettings(AnalyzerProvider<T> provider)` has been
25-
renamed to `requiresAnalysisSettings`
25+
renamed to `requiresAnalysisSettings`
26+
27+
==== File-based discovery plugin
28+
29+
* This plugin has been removed since its functionality is now part of
30+
Elasticsearch and requires no plugin. The location of the hosts file has moved
31+
from `$ES_PATH_CONF/file-discovery/unicast_hosts.txt` to
32+
`$ES_PATH_CONF/unicast_hosts.txt`. See <<file-based-hosts-provider, the
33+
file-based hosts provider documentation>> for further information.

plugins/discovery-file/build.gradle

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

plugins/discovery-file/config/discovery-file/unicast_hosts.txt

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

plugins/discovery-file/src/main/java/org/elasticsearch/discovery/file/FileBasedDiscoveryPlugin.java

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

plugins/discovery-file/src/test/java/org/elasticsearch/discovery/file/FileBasedDiscoveryClientYamlTestSuiteIT.java

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

plugins/discovery-file/src/test/java/org/elasticsearch/discovery/file/FileBasedDiscoveryPluginDeprecationTests.java

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

plugins/discovery-file/src/test/resources/rest-api-spec/test/discovery_file/10_basic.yml

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

0 commit comments

Comments
 (0)