From b5aecf38cb61112bacecb6191e9a6aebc7aaaa1a Mon Sep 17 00:00:00 2001 From: Mashhur Date: Wed, 12 Mar 2025 16:57:24 -0700 Subject: [PATCH 1/2] Apply upstream ES GeoIP factory interface changes. --- .../filters/elasticintegration/IngestPipelineFactory.java | 3 ++- .../elasticintegration/geoip/GeoIpProcessorFactory.java | 7 +++++-- .../elasticintegration/ingest/PipelineProcessor.java | 4 +++- .../ingest/SetSecurityUserProcessor.java | 3 ++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/co/elastic/logstash/filters/elasticintegration/IngestPipelineFactory.java b/src/main/java/co/elastic/logstash/filters/elasticintegration/IngestPipelineFactory.java index ec952314..73a87c37 100644 --- a/src/main/java/co/elastic/logstash/filters/elasticintegration/IngestPipelineFactory.java +++ b/src/main/java/co/elastic/logstash/filters/elasticintegration/IngestPipelineFactory.java @@ -9,6 +9,7 @@ import co.elastic.logstash.filters.elasticintegration.ingest.PipelineProcessor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.elasticsearch.cluster.metadata.ProjectId; import org.elasticsearch.ingest.Pipeline; import org.elasticsearch.ingest.PipelineConfiguration; import org.elasticsearch.ingest.Processor; @@ -46,7 +47,7 @@ public IngestPipelineFactory withProcessors(final Map public Optional create(final PipelineConfiguration pipelineConfiguration) { try { - final Pipeline pipeline = Pipeline.create(pipelineConfiguration.getId(), pipelineConfiguration.getConfig(false), processorFactories, scriptService); + final Pipeline pipeline = Pipeline.create(pipelineConfiguration.getId(), pipelineConfiguration.getConfig(false), processorFactories, scriptService, ProjectId.DEFAULT); final IngestPipeline ingestPipeline = new IngestPipeline(pipelineConfiguration, pipeline); LOGGER.debug(() -> String.format("successfully created ingest pipeline `%s` from pipeline configuration", pipelineConfiguration.getId())); return Optional.of(ingestPipeline); diff --git a/src/main/java/co/elastic/logstash/filters/elasticintegration/geoip/GeoIpProcessorFactory.java b/src/main/java/co/elastic/logstash/filters/elasticintegration/geoip/GeoIpProcessorFactory.java index 4365c799..7aff8aa0 100644 --- a/src/main/java/co/elastic/logstash/filters/elasticintegration/geoip/GeoIpProcessorFactory.java +++ b/src/main/java/co/elastic/logstash/filters/elasticintegration/geoip/GeoIpProcessorFactory.java @@ -6,6 +6,7 @@ */ package co.elastic.logstash.filters.elasticintegration.geoip; +import org.elasticsearch.cluster.metadata.ProjectId; import org.elasticsearch.ingest.Processor; import org.elasticsearch.ingest.geoip.GeoIpProcessor; @@ -22,7 +23,9 @@ public GeoIpProcessorFactory(final IpDatabaseProvider ipDatabaseProvider) { public Processor create(Map processorFactories, String tag, String description, - Map config) throws Exception { - return new GeoIpProcessor.Factory("geoip", this.ipDatabaseProvider).create(processorFactories, tag, description, config); + Map config, + ProjectId projectId) throws Exception { + return new GeoIpProcessor.Factory("geoip", this.ipDatabaseProvider) + .create(processorFactories, tag, description, config, projectId); } } diff --git a/src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/PipelineProcessor.java b/src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/PipelineProcessor.java index 5efe73ce..16298d09 100644 --- a/src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/PipelineProcessor.java +++ b/src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/PipelineProcessor.java @@ -10,6 +10,7 @@ import co.elastic.logstash.filters.elasticintegration.IngestPipelineResolver; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.elasticsearch.cluster.metadata.ProjectId; import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.ConfigurationUtils; import org.elasticsearch.ingest.IngestDocument; @@ -91,7 +92,8 @@ public Factory(IngestPipelineResolver pipelineProvider, ScriptService scriptServ public Processor create(Map registry, String processorTag, String description, - Map config) throws Exception { + Map config, + ProjectId projectId) throws Exception { String pipeline = ConfigurationUtils.readStringProperty(TYPE, processorTag, config, "name"); TemplateScript.Factory pipelineTemplate = ConfigurationUtils.compileTemplate(TYPE, processorTag, "name", pipeline, scriptService); boolean ignoreMissingPipeline = ConfigurationUtils.readBooleanProperty(TYPE, processorTag, config, "ignore_missing_pipeline", false); diff --git a/src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/SetSecurityUserProcessor.java b/src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/SetSecurityUserProcessor.java index 52cfe329..4cf31a6b 100644 --- a/src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/SetSecurityUserProcessor.java +++ b/src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/SetSecurityUserProcessor.java @@ -6,6 +6,7 @@ */ package co.elastic.logstash.filters.elasticintegration.ingest; +import org.elasticsearch.cluster.metadata.ProjectId; import org.elasticsearch.ingest.AbstractProcessor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.Processor; @@ -36,7 +37,7 @@ public static final class Factory implements Processor.Factory { @Override public SetSecurityUserProcessor create(Map registry, String processorTag, - String description, Map config) { + String description, Map config, ProjectId projectId) { String[] supportedConfigs = {"field", "properties"}; for (String cfg : supportedConfigs) { config.remove(cfg); From 723364d69df600205753895c1b00f6e359bf178b Mon Sep 17 00:00:00 2001 From: Mashhur Date: Wed, 12 Mar 2025 17:20:11 -0700 Subject: [PATCH 2/2] Keep setting ES treeish main in main branch. --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8b8f9bce..89483d25 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ LOGSTASH_PATH=../../logstash -ELASTICSEARCH_TREEISH=9.0 +ELASTICSEARCH_TREEISH=main