Skip to content

Commit 18333c6

Browse files
mashhursmashhurs
committed
Plugins and processors moved to the bridge
1 parent a3954fe commit 18333c6

File tree

3 files changed

+40
-63
lines changed

3 files changed

+40
-63
lines changed

‎src/main/java/co/elastic/logstash/filters/elasticintegration/EventProcessorBuilder.java

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import co.elastic.logstash.api.Event;
1010
import co.elastic.logstash.api.FilterMatchListener;
11-
import co.elastic.logstash.filters.elasticintegration.ingest.RedactPlugin;
1211
import co.elastic.logstash.filters.elasticintegration.ingest.SetSecurityUserProcessor;
1312
import co.elastic.logstash.filters.elasticintegration.ingest.SingleProcessorIngestPlugin;
1413
import co.elastic.logstash.filters.elasticintegration.resolver.CacheReloadService;
@@ -24,7 +23,10 @@
2423
import org.elasticsearch.logstashbridge.core.IOUtilsBridge;
2524
import org.elasticsearch.logstashbridge.env.EnvironmentBridge;
2625
import org.elasticsearch.logstashbridge.ingest.ProcessorBridge;
26+
import org.elasticsearch.logstashbridge.plugins.IngestCommonPluginBridge;
2727
import org.elasticsearch.logstashbridge.plugins.IngestPluginBridge;
28+
import org.elasticsearch.logstashbridge.plugins.IngestUserAgentPluginBridge;
29+
import org.elasticsearch.logstashbridge.plugins.RedactPluginBridge;
2830
import org.elasticsearch.logstashbridge.script.ScriptServiceBridge;
2931
import org.elasticsearch.logstashbridge.threadpool.ThreadPoolBridge;
3032

@@ -70,43 +72,43 @@ public static EventProcessorBuilder fromElasticsearch(final RestClient elasticse
7072
}
7173

7274
public EventProcessorBuilder() {
73-
this.addProcessorsFromPlugin(() -> IngestPluginBridge.wrap(new org.elasticsearch.ingest.common.IngestCommonPlugin()), Set.of(
74-
org.elasticsearch.ingest.common.AppendProcessor.TYPE,
75-
org.elasticsearch.ingest.common.BytesProcessor.TYPE,
76-
org.elasticsearch.ingest.common.CommunityIdProcessor.TYPE,
77-
org.elasticsearch.ingest.common.ConvertProcessor.TYPE,
78-
org.elasticsearch.ingest.common.CsvProcessor.TYPE,
79-
org.elasticsearch.ingest.common.DateIndexNameProcessor.TYPE,
80-
org.elasticsearch.ingest.common.DateProcessor.TYPE,
81-
org.elasticsearch.ingest.common.DissectProcessor.TYPE,
75+
this.addProcessorsFromPlugin(IngestCommonPluginBridge::new, Set.of(
76+
ProcessorBridge.Constants.APPEND_PROCESSOR_TYPE,
77+
ProcessorBridge.Constants.BYTES_PROCESSOR_TYPE,
78+
ProcessorBridge.Constants.COMMUNITY_ID_PROCESSOR_TYPE,
79+
ProcessorBridge.Constants.CONVERT_PROCESSOR_TYPE,
80+
ProcessorBridge.Constants.CSV_PROCESSOR_TYPE,
81+
ProcessorBridge.Constants.DATE_INDEX_NAME_PROCESSOR_TYPE,
82+
ProcessorBridge.Constants.DATE_PROCESSOR_TYPE,
83+
ProcessorBridge.Constants.DISSECT_PROCESSOR_TYPE,
8284
"dot_expander", // note: upstream constant is package-private
83-
org.elasticsearch.ingest.DropProcessor.TYPE, // note: not in ingest-common
84-
org.elasticsearch.ingest.common.FailProcessor.TYPE,
85-
org.elasticsearch.ingest.common.FingerprintProcessor.TYPE,
86-
org.elasticsearch.ingest.common.ForEachProcessor.TYPE,
87-
org.elasticsearch.ingest.common.GrokProcessor.TYPE,
88-
org.elasticsearch.ingest.common.GsubProcessor.TYPE,
89-
org.elasticsearch.ingest.common.HtmlStripProcessor.TYPE,
90-
org.elasticsearch.ingest.common.JoinProcessor.TYPE,
91-
org.elasticsearch.ingest.common.JsonProcessor.TYPE,
92-
org.elasticsearch.ingest.common.KeyValueProcessor.TYPE,
93-
org.elasticsearch.ingest.common.LowercaseProcessor.TYPE,
94-
org.elasticsearch.ingest.common.NetworkDirectionProcessor.TYPE,
85+
ProcessorBridge.Constants.DROP_PROCESSOR_TYPE,
86+
ProcessorBridge.Constants.FAIL_PROCESSOR_TYPE,
87+
ProcessorBridge.Constants.FINGERPRINT_PROCESSOR_TYPE,
88+
ProcessorBridge.Constants.FOR_EACH_PROCESSOR_TYPE,
89+
ProcessorBridge.Constants.GROK_PROCESSOR_TYPE,
90+
ProcessorBridge.Constants.GSUB_PROCESSOR_TYPE,
91+
ProcessorBridge.Constants.HTML_STRIP_PROCESSOR_TYPE,
92+
ProcessorBridge.Constants.JOIN_PROCESSOR_TYPE,
93+
ProcessorBridge.Constants.JSON_PROCESSOR_TYPE,
94+
ProcessorBridge.Constants.KEY_VALUE_PROCESSOR_TYPE,
95+
ProcessorBridge.Constants.LOWERCASE_PROCESSOR_TYPE,
96+
ProcessorBridge.Constants.NETWORK_DIRECTION_PROCESSOR_TYPE,
9597
// note: no `pipeline` processor, as we provide our own
96-
org.elasticsearch.ingest.common.RegisteredDomainProcessor.TYPE,
97-
org.elasticsearch.ingest.common.RemoveProcessor.TYPE,
98-
org.elasticsearch.ingest.common.RenameProcessor.TYPE,
99-
org.elasticsearch.ingest.common.RerouteProcessor.TYPE,
100-
org.elasticsearch.ingest.common.ScriptProcessor.TYPE,
101-
org.elasticsearch.ingest.common.SetProcessor.TYPE,
102-
org.elasticsearch.ingest.common.SortProcessor.TYPE,
103-
org.elasticsearch.ingest.common.SplitProcessor.TYPE,
104-
org.elasticsearch.ingest.common.TrimProcessor.TYPE,
105-
org.elasticsearch.ingest.common.URLDecodeProcessor.TYPE,
106-
org.elasticsearch.ingest.common.UppercaseProcessor.TYPE,
107-
org.elasticsearch.ingest.common.UriPartsProcessor.TYPE));
108-
this.addProcessorsFromPlugin(() -> IngestPluginBridge.wrap(new org.elasticsearch.ingest.useragent.IngestUserAgentPlugin()));
109-
this.addProcessorsFromPlugin(RedactPlugin::new);
98+
ProcessorBridge.Constants.REGISTERED_DOMAIN_PROCESSOR_TYPE,
99+
ProcessorBridge.Constants.REMOVE_PROCESSOR_TYPE,
100+
ProcessorBridge.Constants.RENAME_PROCESSOR_TYPE,
101+
ProcessorBridge.Constants.REROUTE_PROCESSOR_TYPE,
102+
ProcessorBridge.Constants.SCRIPT_PROCESSOR_TYPE,
103+
ProcessorBridge.Constants.SET_PROCESSOR_TYPE,
104+
ProcessorBridge.Constants.SORT_PROCESSOR_TYPE,
105+
ProcessorBridge.Constants.SPLIT_PROCESSOR_TYPE,
106+
ProcessorBridge.Constants.TRIM_PROCESSOR_TYPE,
107+
ProcessorBridge.Constants.URL_DECODE_PROCESSOR_TYPE,
108+
ProcessorBridge.Constants.UPPERCASE_PROCESSOR_TYPE,
109+
ProcessorBridge.Constants.URI_PARTS_PROCESSOR_TYPE));
110+
this.addProcessorsFromPlugin(IngestUserAgentPluginBridge::new);
111+
this.addProcessorsFromPlugin(RedactPluginBridge::new);
110112
this.addProcessor(SetSecurityUserProcessor.TYPE, SetSecurityUserProcessor.Factory::new);
111113
}
112114

‎src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/RedactPlugin.java

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

‎src/main/java/co/elastic/logstash/filters/elasticintegration/ingest/SingleProcessorIngestPlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
package co.elastic.logstash.filters.elasticintegration.ingest;
88

9-
import org.elasticsearch.core.IOUtils;
9+
import org.elasticsearch.logstashbridge.core.IOUtilsBridge;
1010
import org.elasticsearch.logstashbridge.ingest.ProcessorBridge;
1111
import org.elasticsearch.logstashbridge.plugins.IngestPluginBridge;
1212

@@ -36,7 +36,7 @@ public Map<String, ProcessorBridge.Factory> getProcessors(ProcessorBridge.Parame
3636
@Override
3737
public void close() throws IOException {
3838
if (this.processorFactory instanceof Closeable) {
39-
IOUtils.closeWhileHandlingException((Closeable) this.processorFactory);
39+
IOUtilsBridge.closeWhileHandlingException((Closeable) this.processorFactory);
4040
}
4141
}
4242
}

0 commit comments

Comments
 (0)