Skip to content

Commit 599ab7a

Browse files
Remove ignored fallback option on GeoIP processor (#116112)
This removes the option `fallback_to_default_databases` on the `geoip` ingest processor has been deprecated and ignored since 8.0.0.
1 parent 90892c7 commit 599ab7a

File tree

3 files changed

+13
-17
lines changed

3 files changed

+13
-17
lines changed

docs/changelog/116112.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
pr: 116112
2+
summary: Remove ignored fallback option on GeoIP processor
3+
area: Ingest Node
4+
type: breaking
5+
issues: []
6+
breaking:
7+
title: Remove ignored fallback option on GeoIP processor
8+
area: Ingest
9+
details: >-
10+
The option fallback_to_default_databases on the geoip ingest processor has been removed.
11+
(It was deprecated and ignored since 8.0.0.)
12+
impact: Customers should stop remove the noop fallback_to_default_databases option on any geoip ingest processors.
13+
notable: false

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
public final class GeoIpProcessor extends AbstractProcessor {
3737

3838
private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(GeoIpProcessor.class);
39-
static final String DEFAULT_DATABASES_DEPRECATION_MESSAGE = "the [fallback_to_default_databases] has been deprecated, because "
40-
+ "Elasticsearch no longer includes the default Maxmind geoip databases. This setting will be removed in Elasticsearch 9.0";
4139
static final String UNSUPPORTED_DATABASE_DEPRECATION_MESSAGE = "the geoip processor will no longer support database type [{}] "
4240
+ "in a future version of Elasticsearch"; // TODO add a message about migration?
4341

@@ -241,12 +239,6 @@ public Processor create(
241239
// validate (and consume) the download_database_on_pipeline_creation property even though the result is not used by the factory
242240
readBooleanProperty(type, processorTag, config, "download_database_on_pipeline_creation", true);
243241

244-
// noop, should be removed in 9.0
245-
Object value = config.remove("fallback_to_default_databases");
246-
if (value != null) {
247-
deprecationLogger.warn(DeprecationCategory.OTHER, "default_databases_message", DEFAULT_DATABASES_DEPRECATION_MESSAGE);
248-
}
249-
250242
final String databaseType;
251243
try (IpDatabase ipDatabase = ipDatabaseProvider.getDatabase(databaseFile)) {
252244
if (ipDatabase == null) {

modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorFactoryTests.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -473,15 +473,6 @@ public void testLoadingCustomDatabase() throws IOException {
473473
threadPool.shutdown();
474474
}
475475

476-
public void testFallbackUsingDefaultDatabases() throws Exception {
477-
GeoIpProcessor.Factory factory = new GeoIpProcessor.Factory(GEOIP_TYPE, databaseNodeService);
478-
Map<String, Object> config = new HashMap<>();
479-
config.put("field", "source_field");
480-
config.put("fallback_to_default_databases", randomBoolean());
481-
factory.create(null, null, null, config);
482-
assertWarnings(GeoIpProcessor.DEFAULT_DATABASES_DEPRECATION_MESSAGE);
483-
}
484-
485476
public void testDownloadDatabaseOnPipelineCreation() throws IOException {
486477
GeoIpProcessor.Factory factory = new GeoIpProcessor.Factory(GEOIP_TYPE, databaseNodeService);
487478
Map<String, Object> config = new HashMap<>();

0 commit comments

Comments
 (0)