Geoip processor should respect the ignore_missing parameter in case o…

…f missing database (#87793) (#88051) If database is missing then respect ignore_missing parameter configured on the geoip processor. If ignore_missing is enabled then the document should not be tagged. In this case the document shouldn't be tagged. Closes #87345
elastic · Jun 27, 2022 · 81e948a · 81e948a
1 parent f43bfbd
commit 81e948a
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 1 deletion.
diff --git a/docs/changelog/87793.yaml b/docs/changelog/87793.yaml
@@ -0,0 +1,6 @@
+pr: 87793
+summary: Geoip processor should respect the `ignore_missing` in case of missing database
+area: Ingest
+type: bug
+issues:
+ - 87345
diff --git a/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java b/modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpProcessor.java
@@ -127,7 +127,9 @@ public IngestDocument execute(IngestDocument ingestDocument) throws IOException
 
         DatabaseReaderLazyLoader lazyLoader = this.supplier.get();
         if (lazyLoader == null) {
-            tag(ingestDocument, databaseFile);
+            if (ignoreMissing == false) {
+                tag(ingestDocument, databaseFile);
+            }
             return ingestDocument;
         }
 

diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorTests.java
@@ -500,6 +500,51 @@ public void testInvalidDatabase() throws Exception {
         assertThat(ingestDocument.getSourceAndMetadata(), hasEntry("tags", List.of("_geoip_expired_database")));
     }
 
+    public void testNoDatabase() throws Exception {
+        GeoIpProcessor processor = new GeoIpProcessor(
+            randomAlphaOfLength(10),
+            null,
+            "source_field",
+            () -> null,
+            () -> true,
+            "target_field",
+            EnumSet.allOf(GeoIpProcessor.Property.class),
+            false,
+            false,
+            "GeoLite2-City"
+        );
+
+        Map<String, Object> document = new HashMap<>();
+        document.put("source_field", "8.8.8.8");
+        IngestDocument originalIngestDocument = RandomDocumentPicks.randomIngestDocument(random(), document);
+        IngestDocument ingestDocument = new IngestDocument(originalIngestDocument);
+        processor.execute(ingestDocument);
+        assertThat(ingestDocument.getSourceAndMetadata().containsKey("target_field"), is(false));
+        assertThat(ingestDocument.getSourceAndMetadata(), hasEntry("tags", List.of("_geoip_database_unavailable_GeoLite2-City")));
+    }
+
+    public void testNoDatabase_ignoreMissing() throws Exception {
+        GeoIpProcessor processor = new GeoIpProcessor(
+            randomAlphaOfLength(10),
+            null,
+            "source_field",
+            () -> null,
+            () -> true,
+            "target_field",
+            EnumSet.allOf(GeoIpProcessor.Property.class),
+            true,
+            false,
+            "GeoLite2-City"
+        );
+
+        Map<String, Object> document = new HashMap<>();
+        document.put("source_field", "8.8.8.8");
+        IngestDocument originalIngestDocument = RandomDocumentPicks.randomIngestDocument(random(), document);
+        IngestDocument ingestDocument = new IngestDocument(originalIngestDocument);
+        processor.execute(ingestDocument);
+        assertIngestDocument(originalIngestDocument, ingestDocument);
+    }
+
     private CheckedSupplier<DatabaseReaderLazyLoader, IOException> loader(final String path) {
         final Supplier<InputStream> databaseInputStreamSupplier = () -> GeoIpProcessor.class.getResourceAsStream(path);
         final CheckedSupplier<DatabaseReader, IOException> loader = () -> new DatabaseReader.Builder(databaseInputStreamSupplier.get())