diff --git a/config/log4j2.properties b/config/log4j2.properties index 68dd14240..66269e950 100644 --- a/config/log4j2.properties +++ b/config/log4j2.properties @@ -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.name = filter_no_pipelined 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.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.name = filter_no_pipelined 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.name = pipeline_routing_appender @@ -59,7 +59,7 @@ appender.routing.routes.type = Routes appender.routing.routes.script.type = Script appender.routing.routes.script.name = routing_script 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.rolling.type = RollingFile appender.routing.routes.route_pipelines.rolling.name = appender-${ctx:pipeline.id} diff --git a/logstash-core/benchmarks/src/main/resources/log4j2-with-script.properties b/logstash-core/benchmarks/src/main/resources/log4j2-with-script.properties index 10f087d96..7c326d5fb 100644 --- a/logstash-core/benchmarks/src/main/resources/log4j2-with-script.properties +++ b/logstash-core/benchmarks/src/main/resources/log4j2-with-script.properties @@ -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.name = filter_no_pipelined 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.name = pipeline_routing_appender @@ -27,7 +27,7 @@ appender.routing.routes.type = Routes appender.routing.routes.script.type = Script appender.routing.routes.script.name = routing_script 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.rolling.type = RollingFile appender.routing.routes.route_pipelines.rolling.name = appender-${ctx:pipeline.id} diff --git a/logstash-core/src/test/resources/log4j2-log-pipeline-test.properties b/logstash-core/src/test/resources/log4j2-log-pipeline-test.properties index ca06848e2..782af7dc6 100644 --- a/logstash-core/src/test/resources/log4j2-log-pipeline-test.properties +++ b/logstash-core/src/test/resources/log4j2-log-pipeline-test.properties @@ -22,7 +22,7 @@ appender.routing.routes.type = Routes appender.routing.routes.script.type = Script appender.routing.routes.script.name = routing_script 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.list.type = List appender.routing.routes.route1.list.name = appender-${mdc:pipeline.id} diff --git a/qa/integration/fixtures/persistent_queues/log4j2.properties b/qa/integration/fixtures/persistent_queues/log4j2.properties index 0791a21b1..dffe516fe 100644 --- a/qa/integration/fixtures/persistent_queues/log4j2.properties +++ b/qa/integration/fixtures/persistent_queues/log4j2.properties @@ -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.name = filter_no_pipelined 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.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.name = filter_no_pipelined 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.name = pipeline_routing_appender @@ -59,7 +59,7 @@ appender.routing.routes.type = Routes appender.routing.routes.script.type = Script appender.routing.routes.script.name = routing_script 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.rolling.type = RollingFile appender.routing.routes.route_pipelines.rolling.name = appender-${ctx:pipeline.id}