github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-25 07:07:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

update log4j script routes definition

Browse source 
fixes the change introduced with https://issues.apache.org/jira/browse/LOG4J2-2647
This commit is contained in:
Joao Duarte 2020-06-09 11:18:34 +01:00 • committed by João Duarte
parent 216fa60b23
commit e5f1e613ef
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/log4j2.properties
View file

@ -30,7 +30,7 @@ appender.rolling.avoid_pipelined_filter.type = ScriptFilter
appender.rolling.avoid_pipelined_filter.script.type = Script appender.rolling.avoid_pipelined_filter.script.type = Script
appender.rolling.avoid_pipelined_filter.script.name = filter_no_pipelined appender.rolling.avoid_pipelined_filter.script.name = filter_no_pipelined
appender.rolling.avoid_pipelined_filter.script.language = JavaScript appender.rolling.avoid_pipelined_filter.script.language = JavaScript
appender.rolling.avoid_pipelined_filter.script.value = ${sys:ls.pipeline.separate_logs} == false || !(logEvent.getContextData().containsKey("pipeline.id")) appender.rolling.avoid_pipelined_filter.script.scriptText = ${sys:ls.pipeline.separate_logs} == false || !(logEvent.getContextData().containsKey("pipeline.id"))
appender.json_rolling.type = RollingFile appender.json_rolling.type = RollingFile
appender.json_rolling.name = json_rolling appender.json_rolling.name = json_rolling
@ -51,7 +51,7 @@ appender.json_rolling.avoid_pipelined_filter.type = ScriptFilter
appender.json_rolling.avoid_pipelined_filter.script.type = Script appender.json_rolling.avoid_pipelined_filter.script.type = Script
appender.json_rolling.avoid_pipelined_filter.script.name = filter_no_pipelined appender.json_rolling.avoid_pipelined_filter.script.name = filter_no_pipelined
appender.json_rolling.avoid_pipelined_filter.script.language = JavaScript appender.json_rolling.avoid_pipelined_filter.script.language = JavaScript
appender.json_rolling.avoid_pipelined_filter.script.value = ${sys:ls.pipeline.separate_logs} == false || !(logEvent.getContextData().containsKey("pipeline.id")) appender.json_rolling.avoid_pipelined_filter.script.scriptText = ${sys:ls.pipeline.separate_logs} == false || !(logEvent.getContextData().containsKey("pipeline.id"))
appender.routing.type = Routing appender.routing.type = Routing
appender.routing.name = pipeline_routing_appender appender.routing.name = pipeline_routing_appender
@ -59,7 +59,7 @@ appender.routing.routes.type = Routes
appender.routing.routes.script.type = Script appender.routing.routes.script.type = Script
appender.routing.routes.script.name = routing_script appender.routing.routes.script.name = routing_script
appender.routing.routes.script.language = JavaScript appender.routing.routes.script.language = JavaScript
appender.routing.routes.script.value = logEvent.getContextData().containsKey("pipeline.id") ? logEvent.getContextData().getValue("pipeline.id") : "sink"; appender.routing.routes.script.scriptText = logEvent.getContextData().containsKey("pipeline.id") ? logEvent.getContextData().getValue("pipeline.id") : "sink";
appender.routing.routes.route_pipelines.type = Route appender.routing.routes.route_pipelines.type = Route
appender.routing.routes.route_pipelines.rolling.type = RollingFile appender.routing.routes.route_pipelines.rolling.type = RollingFile
appender.routing.routes.route_pipelines.rolling.name = appender-${ctx:pipeline.id} appender.routing.routes.route_pipelines.rolling.name = appender-${ctx:pipeline.id}

4
logstash-core/benchmarks/src/main/resources/log4j2-with-script.properties
View file

@ -19,7 +19,7 @@ appender.rolling.avoid_pipelined_filter.type = ScriptFilter
appender.rolling.avoid_pipelined_filter.script.type = Script appender.rolling.avoid_pipelined_filter.script.type = Script
appender.rolling.avoid_pipelined_filter.script.name = filter_no_pipelined appender.rolling.avoid_pipelined_filter.script.name = filter_no_pipelined
appender.rolling.avoid_pipelined_filter.script.language = JavaScript appender.rolling.avoid_pipelined_filter.script.language = JavaScript
appender.rolling.avoid_pipelined_filter.script.value = ${sys:ls.pipeline.separate_logs} == false || !(logEvent.getContextData().containsKey("pipeline.id")) appender.rolling.avoid_pipelined_filter.script.scriptText = ${sys:ls.pipeline.separate_logs} == false || !(logEvent.getContextData().containsKey("pipeline.id"))
appender.routing.type = Routing appender.routing.type = Routing
appender.routing.name = pipeline_routing_appender appender.routing.name = pipeline_routing_appender
@ -27,7 +27,7 @@ appender.routing.routes.type = Routes
appender.routing.routes.script.type = Script appender.routing.routes.script.type = Script
appender.routing.routes.script.name = routing_script appender.routing.routes.script.name = routing_script
appender.routing.routes.script.language = JavaScript appender.routing.routes.script.language = JavaScript
appender.routing.routes.script.value = logEvent.getContextData().containsKey("pipeline.id") ? logEvent.getContextData().getValue("pipeline.id") : "sink"; appender.routing.routes.script.scriptText = logEvent.getContextData().containsKey("pipeline.id") ? logEvent.getContextData().getValue("pipeline.id") : "sink";
appender.routing.routes.route_pipelines.type = Route appender.routing.routes.route_pipelines.type = Route
appender.routing.routes.route_pipelines.rolling.type = RollingFile appender.routing.routes.route_pipelines.rolling.type = RollingFile
appender.routing.routes.route_pipelines.rolling.name = appender-${ctx:pipeline.id} appender.routing.routes.route_pipelines.rolling.name = appender-${ctx:pipeline.id}

2
logstash-core/src/test/resources/log4j2-log-pipeline-test.properties
View file

@ -22,7 +22,7 @@ appender.routing.routes.type = Routes
appender.routing.routes.script.type = Script appender.routing.routes.script.type = Script
appender.routing.routes.script.name = routing_script appender.routing.routes.script.name = routing_script
appender.routing.routes.script.language = JavaScript appender.routing.routes.script.language = JavaScript
appender.routing.routes.script.value = logEvent.getContextMap().get("pipeline.id") appender.routing.routes.script.scriptText = logEvent.getContextMap().get("pipeline.id")
appender.routing.routes.route1.type = Route appender.routing.routes.route1.type = Route
appender.routing.routes.route1.list.type = List appender.routing.routes.route1.list.type = List
appender.routing.routes.route1.list.name = appender-${mdc:pipeline.id} appender.routing.routes.route1.list.name = appender-${mdc:pipeline.id}

6
qa/integration/fixtures/persistent_queues/log4j2.properties
View file

@ -30,7 +30,7 @@ appender.rolling.avoid_pipelined_filter.type = ScriptFilter
appender.rolling.avoid_pipelined_filter.script.type = Script appender.rolling.avoid_pipelined_filter.script.type = Script
appender.rolling.avoid_pipelined_filter.script.name = filter_no_pipelined appender.rolling.avoid_pipelined_filter.script.name = filter_no_pipelined
appender.rolling.avoid_pipelined_filter.script.language = JavaScript appender.rolling.avoid_pipelined_filter.script.language = JavaScript
appender.rolling.avoid_pipelined_filter.script.value = ${sys:ls.pipeline.separate_logs} == false || !(logEvent.getContextData().containsKey("pipeline.id")) appender.rolling.avoid_pipelined_filter.script.scriptText = ${sys:ls.pipeline.separate_logs} == false || !(logEvent.getContextData().containsKey("pipeline.id"))
appender.json_rolling.type = RollingFile appender.json_rolling.type = RollingFile
appender.json_rolling.name = json_rolling appender.json_rolling.name = json_rolling
@ -51,7 +51,7 @@ appender.json_rolling.avoid_pipelined_filter.type = ScriptFilter
appender.json_rolling.avoid_pipelined_filter.script.type = Script appender.json_rolling.avoid_pipelined_filter.script.type = Script
appender.json_rolling.avoid_pipelined_filter.script.name = filter_no_pipelined appender.json_rolling.avoid_pipelined_filter.script.name = filter_no_pipelined
appender.json_rolling.avoid_pipelined_filter.script.language = JavaScript appender.json_rolling.avoid_pipelined_filter.script.language = JavaScript
appender.json_rolling.avoid_pipelined_filter.script.value = ${sys:ls.pipeline.separate_logs} == false || !(logEvent.getContextData().containsKey("pipeline.id")) appender.json_rolling.avoid_pipelined_filter.script.scriptText = ${sys:ls.pipeline.separate_logs} == false || !(logEvent.getContextData().containsKey("pipeline.id"))
appender.routing.type = Routing appender.routing.type = Routing
appender.routing.name = pipeline_routing_appender appender.routing.name = pipeline_routing_appender
@ -59,7 +59,7 @@ appender.routing.routes.type = Routes
appender.routing.routes.script.type = Script appender.routing.routes.script.type = Script
appender.routing.routes.script.name = routing_script appender.routing.routes.script.name = routing_script
appender.routing.routes.script.language = JavaScript appender.routing.routes.script.language = JavaScript
appender.routing.routes.script.value = logEvent.getContextData().containsKey("pipeline.id") ? logEvent.getContextData().getValue("pipeline.id") : "sink"; appender.routing.routes.script.scriptText = logEvent.getContextData().containsKey("pipeline.id") ? logEvent.getContextData().getValue("pipeline.id") : "sink";
appender.routing.routes.route_pipelines.type = Route appender.routing.routes.route_pipelines.type = Route
appender.routing.routes.route_pipelines.rolling.type = RollingFile appender.routing.routes.route_pipelines.rolling.type = RollingFile
appender.routing.routes.route_pipelines.rolling.name = appender-${ctx:pipeline.id} appender.routing.routes.route_pipelines.rolling.name = appender-${ctx:pipeline.id}