From 221ef1197866c622826aa1e40bad20c47533abdc Mon Sep 17 00:00:00 2001 From: logstashmachine <43502315+logstashmachine@users.noreply.github.com> Date: Wed, 5 Feb 2025 16:50:40 +0000 Subject: [PATCH 1/4] Update patch plugin versions in gemfile lock --- Gemfile.jruby-3.1.lock.release | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/Gemfile.jruby-3.1.lock.release b/Gemfile.jruby-3.1.lock.release index 77c9a531f25..51841e878a0 100644 --- a/Gemfile.jruby-3.1.lock.release +++ b/Gemfile.jruby-3.1.lock.release @@ -182,7 +182,7 @@ GEM domain_name (~> 0.5) http-form_data (2.3.0) http_parser.rb (0.6.0-java) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) insist (1.0.0) jar-dependencies (0.4.1) @@ -195,7 +195,7 @@ GEM jruby-jms (1.3.0-java) gene_pool semantic_logger - jruby-openssl (0.15.2-java) + jruby-openssl (0.15.3-java) jruby-stdin-channel (0.2.0-java) json (2.7.6-java) json-schema (2.8.1) @@ -204,8 +204,8 @@ GEM base64 kramdown (2.4.0) rexml - language_server-protocol (3.17.0.3) - logger (1.6.4) + language_server-protocol (3.17.0.4) + logger (1.6.5) logstash-codec-avro (3.4.1-java) avro (~> 1.10.2) logstash-core-plugin-api (>= 1.60, <= 2.99) @@ -322,7 +322,7 @@ GEM lru_redux (~> 1.1.0) logstash-filter-drop (3.0.5) logstash-core-plugin-api (>= 1.60, <= 2.99) - logstash-filter-elastic_integration (8.16.0-java) + logstash-filter-elastic_integration (8.16.1-java) logstash-core (>= 8.7.0) logstash-core-plugin-api (>= 1.60, <= 2.99) logstash-filter-elasticsearch (3.16.2) @@ -409,9 +409,8 @@ GEM logstash-codec-plain logstash-core-plugin-api (~> 2.0) stud (>= 0.0.22) - logstash-input-beats (6.9.1-java) + logstash-input-beats (6.9.2-java) concurrent-ruby (~> 1.0) - jar-dependencies (~> 0.3, >= 0.3.4) logstash-codec-multiline (>= 2.0.5) logstash-codec-plain logstash-core-plugin-api (>= 1.60, <= 2.99) @@ -529,7 +528,7 @@ GEM logstash-filter-grok (>= 4.4.1) logstash-mixin-ecs_compatibility_support (~> 1.2) stud (>= 0.0.22, < 0.1.0) - logstash-input-tcp (6.4.4-java) + logstash-input-tcp (6.4.5-java) jruby-openssl (>= 0.12.2) logstash-codec-json logstash-codec-json_lines @@ -614,7 +613,7 @@ GEM logstash-core-plugin-api (>= 1.60, <= 2.99) march_hare (~> 4.0) stud (~> 0.0.22) - logstash-integration-snmp (4.0.5-java) + logstash-integration-snmp (4.0.6-java) logstash-codec-plain logstash-core (>= 6.5.0) logstash-core-plugin-api (>= 1.60, <= 2.99) @@ -647,7 +646,7 @@ GEM logstash-output-csv (3.0.10) logstash-core-plugin-api (>= 1.60, <= 2.99) logstash-output-file - logstash-output-elasticsearch (11.22.10-java) + logstash-output-elasticsearch (11.22.12-java) logstash-core-plugin-api (>= 1.60, <= 2.99) logstash-mixin-ca_trusted_fingerprint_support (~> 1.0) logstash-mixin-deprecation_logger_support (~> 1.0) @@ -737,7 +736,7 @@ GEM net-protocol net-protocol (0.2.2) timeout - net-smtp (0.5.0) + net-smtp (0.5.1) net-protocol nio4r (2.7.4-java) nokogiri (1.16.8-java) @@ -748,7 +747,7 @@ GEM openssl_pkcs8_pure (0.0.0.2) paquet (0.2.1) parallel (1.26.3) - parser (3.3.6.0) + parser (3.3.7.1) ast (~> 2.4.1) racc pleaserun (0.0.32) @@ -763,14 +762,15 @@ GEM coderay (~> 1.1) method_source (~> 1.0) spoon (~> 0.0) - psych (5.1.2-java) + psych (5.2.2-java) + date jar-dependencies (>= 0.1.7) public_suffix (5.1.1) puma (6.4.3-java) nio4r (~> 2.0) raabro (1.4.0) racc (1.8.1-java) - rack (3.1.8) + rack (3.1.9) rack-protection (4.1.1) base64 (>= 0.1.0) logger (>= 1.6.0) @@ -849,7 +849,7 @@ GEM e2mmap tilt (2.4.0) timeout (0.4.3) - treetop (1.6.12) + treetop (1.6.14) polyglot (~> 0.3) twitter (6.2.0) addressable (~> 2.3) @@ -879,6 +879,7 @@ GEM PLATFORMS java universal-java-11 + universal-java-17 DEPENDENCIES belzebuth @@ -999,6 +1000,7 @@ DEPENDENCIES paquet (~> 0.2) pleaserun (~> 0.0.28) polyglot + psych (= 5.2.2) rack-test rake (~> 13) rspec (~> 3.5) From d02fd0b04f761ddd170e14864672bb409700abba Mon Sep 17 00:00:00 2001 From: Ry Biesemeyer Date: Wed, 5 Feb 2025 16:57:17 +0000 Subject: [PATCH 2/4] pull in minors from ES input and filter --- Gemfile.jruby-3.1.lock.release | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.jruby-3.1.lock.release b/Gemfile.jruby-3.1.lock.release index 51841e878a0..e8c856bfa31 100644 --- a/Gemfile.jruby-3.1.lock.release +++ b/Gemfile.jruby-3.1.lock.release @@ -325,7 +325,7 @@ GEM logstash-filter-elastic_integration (8.16.1-java) logstash-core (>= 8.7.0) logstash-core-plugin-api (>= 1.60, <= 2.99) - logstash-filter-elasticsearch (3.16.2) + logstash-filter-elasticsearch (3.17.0) elasticsearch (>= 7.14.9) logstash-core-plugin-api (>= 1.60, <= 2.99) logstash-mixin-ca_trusted_fingerprint_support (~> 1.0) @@ -435,7 +435,7 @@ GEM logstash-mixin-ecs_compatibility_support (~> 1.2) logstash-mixin-normalize_config_support (~> 1.0) logstash-mixin-plugin_factory_support - logstash-input-elasticsearch (4.20.5) + logstash-input-elasticsearch (4.21.1) elasticsearch (>= 7.17.9) logstash-core-plugin-api (>= 1.60, <= 2.99) logstash-mixin-ca_trusted_fingerprint_support (~> 1.0) From bf5511f3d678b3278cd850a930cdf2af1c898b34 Mon Sep 17 00:00:00 2001 From: Ry Biesemeyer Date: Wed, 5 Feb 2025 09:21:27 -0800 Subject: [PATCH 3/4] remove addition of java 17 platform already covered by `java` platform --- Gemfile.jruby-3.1.lock.release | 1 - 1 file changed, 1 deletion(-) diff --git a/Gemfile.jruby-3.1.lock.release b/Gemfile.jruby-3.1.lock.release index e8c856bfa31..4c645f40571 100644 --- a/Gemfile.jruby-3.1.lock.release +++ b/Gemfile.jruby-3.1.lock.release @@ -879,7 +879,6 @@ GEM PLATFORMS java universal-java-11 - universal-java-17 DEPENDENCIES belzebuth From 28fb4d6de3fe9b945a6fd666d898668f1815e73e Mon Sep 17 00:00:00 2001 From: Ry Biesemeyer Date: Wed, 5 Feb 2025 17:36:30 +0000 Subject: [PATCH 4/4] pull in minor from http input to get fixed netty thread names --- Gemfile.jruby-3.1.lock.release | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile.jruby-3.1.lock.release b/Gemfile.jruby-3.1.lock.release index 4c645f40571..8ae3970a04f 100644 --- a/Gemfile.jruby-3.1.lock.release +++ b/Gemfile.jruby-3.1.lock.release @@ -483,8 +483,7 @@ GEM logstash-mixin-ecs_compatibility_support (~> 1.2) logstash-mixin-event_support (~> 1.0) stud - logstash-input-http (3.9.2-java) - jar-dependencies (~> 0.3, >= 0.3.4) + logstash-input-http (3.10.1-java) logstash-codec-plain logstash-core-plugin-api (>= 1.60, <= 2.99) logstash-mixin-ecs_compatibility_support (~> 1.2)