Merge pull request #239 from kube-logging/fix/patch-es-compat

fix: fluent-plugin-elasticsearch 6.0.0 compat with es 7-8

Author: csatib02

v1.16-4.10/Dockerfile

@@ -95,6 +95,7 @@ RUN apk add --no-cache $BUILD_DEPS \
  # TODO get rid of this by submitting the patch upstream
  && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-gcs.git --ref ad6a7cb0f166e2c1648954a928e1e9b8cdcbf93d \
  && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-syslog_rfc5424.git --ref 4ab9f7df3757b0e31e4bc209acab05a518efdce3 \
+ && fluent-gem specific_install -l https://github.com/kube-logging/fluent-plugin-elasticsearch.git --ref f711c4322e37852a83caab0385ba4567031eb9ab \
  && fluent-gem install --file /Gemfile.outputs \
  && find /usr/local/bundle/gems/ -newer /etc/gemrc -exec chown fluent:fluent {} \; \
  && apk del $BUILD_DEPS \

v1.16-4.10/outputs/Gemfile

@@ -6,7 +6,7 @@ gem 'fluent-plugin-kafka', '0.19.4'
 gem 'fluent-plugin-grafana-loki', '1.2.20'
 gem 'fluent-plugin-kinesis', '3.5.0'
 gem 'fluent-plugin-splunk-hec', '1.3.3'
-gem 'fluent-plugin-elasticsearch', '5.4.4'
+gem 'fluent-plugin-elasticsearch', '6.0.0'
 gem 'fluent-plugin-newrelic', '1.2.3'
 gem 'fluent-plugin-cloudwatch-logs', '0.15.0'
 gem 'fluent-plugin-opensearch', '1.1.5'

v1.16-4.10/outputs/Gemfile.lock

@@ -19,6 +19,24 @@ GEM
     aliyun-sdk (0.7.0)
       nokogiri (~> 1.6)
       rest-client (~> 2.0)
+    async (2.24.0)
+      console (~> 1.29)
+      fiber-annotation
+      io-event (~> 1.9)
+      metrics (~> 0.12)
+      traces (~> 0.15)
+    async-http (0.91.0)
+      async (>= 2.10.2)
+      async-pool (~> 0.11)
+      io-endpoint (~> 0.14)
+      io-stream (~> 0.6)
+      metrics (~> 0.12)
+      protocol-http (~> 0.49)
+      protocol-http1 (~> 0.30)
+      protocol-http2 (~> 0.22)
+      traces (~> 0.10)
+    async-pool (0.11.0)
+      async (>= 2.0)
     attr_required (1.0.1)
     aws-eventstream (1.3.2)
     aws-partitions (1.1103.0)
@@ -43,39 +61,43 @@ GEM
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.11.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    base64 (0.2.0)
+    base64 (0.3.0)
     bigdecimal (3.1.9)
     bindata (2.5.0)
     concurrent-ruby (1.3.5)
     connection_pool (2.4.1)
+    console (1.34.1)
+      fiber-annotation
+      fiber-local (~> 1.1)
+      json
     cool.io (1.9.0)
-    csv (3.3.4)
+    csv (3.3.5)
     date (3.4.1)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    drb (2.2.1)
-    elastic-transport (8.4.0)
+    drb (2.2.3)
+    elastic-transport (8.4.1)
       faraday (< 3)
       multi_json
-    elasticsearch (8.18.0)
-      elastic-transport (~> 8.4)
-      elasticsearch-api (= 8.18.0)
-    elasticsearch-api (8.18.0)
+    elasticsearch (9.1.2)
+      elastic-transport (~> 8.3)
+      elasticsearch-api (= 9.1.2)
+    elasticsearch-api (9.1.2)
       multi_json
-    excon (1.2.5)
+    excon (1.3.0)
       logger
-    faraday (2.13.1)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-excon (2.3.0)
+    faraday-excon (2.4.0)
       excon (>= 1.0.0)
       faraday (>= 2.11.0, < 3)
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
     faraday_middleware-aws-sigv4 (1.0.1)
       aws-sigv4 (~> 1.0)
@@ -84,6 +106,10 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
+    fiber-annotation (0.2.0)
+    fiber-local (1.1.0)
+      fiber-storage
+    fiber-storage (1.0.1)
     fluent-mixin-config-placeholders (0.4.0)
       fluentd
       uuidtools (>= 2.1.5)
@@ -96,7 +122,7 @@ GEM
     fluent-plugin-datadog (0.14.4)
       fluentd (>= 1, < 2)
       net-http-persistent (~> 4.0.1)
-    fluent-plugin-elasticsearch (5.4.4)
+    fluent-plugin-elasticsearch (6.0.0)
       elasticsearch
       excon
       faraday (>= 2.0.0)
@@ -169,22 +195,27 @@ GEM
     fluent-plugin-webhdfs (1.6.0)
       fluentd (>= 0.14.22)
       webhdfs (>= 0.11.0)
-    fluentd (1.18.0)
+    fluentd (1.19.0)
+      async-http (~> 0.86)
       base64 (~> 0.2)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       csv (~> 3.2)
       drb (~> 2.2)
       http_parser.rb (>= 0.5.1, < 0.9.0)
+      io-event (< 1.11.0)
+      io-stream (< 0.8.0)
       logger (~> 1.6)
       msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.3.2, < 3.0.0)
       sigdump (~> 0.2.5)
       strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
+      uri (~> 1.0)
       webrick (~> 1.4)
       yajl-ruby (~> 1.0)
+      zstd-ruby (~> 1.5)
     gelf_redux (4.1.0)
       json
     google-protobuf (3.25.5)
@@ -201,8 +232,11 @@ GEM
     httpclient (2.8.3)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
+    io-endpoint (0.15.2)
+    io-event (1.10.2)
+    io-stream (0.7.0)
     jmespath (1.6.2)
-    json (2.10.2)
+    json (2.15.1)
     json-jwt (1.15.3.1)
       activesupport (>= 4.2)
       aes_key_wrap
@@ -218,14 +252,15 @@ GEM
       net-imap
       net-pop
       net-smtp
+    metrics (0.15.0)
     mime-types (3.5.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.1003)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
     minitest (5.22.2)
     msgpack (1.8.0)
-    multi_json (1.15.0)
+    multi_json (1.17.0)
     mutex_m (0.2.0)
     myslog (0.1.1)
     net-http (0.6.0)
@@ -263,6 +298,13 @@ GEM
       multi_json (>= 1.0)
     ostruct (0.6.1)
     prometheus-client (4.2.1)
+    protocol-hpack (1.5.1)
+    protocol-http (0.54.0)
+    protocol-http1 (0.35.2)
+      protocol-http (~> 0.22)
+    protocol-http2 (0.23.0)
+      protocol-hpack (~> 1.4)
+      protocol-http (~> 0.47)
     public_suffix (5.0.3)
     racc (1.8.1)
     rack (3.0.16)
@@ -298,14 +340,15 @@ GEM
       faraday-follow_redirects
     syslog_protocol (0.9.2)
     timeout (0.4.3)
+    traces (0.18.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2025.2)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    uri (1.0.3)
+    uri (1.0.4)
     uuidtools (2.2.0)
     validate_email (0.1.6)
       activemodel (>= 3.0)
@@ -321,6 +364,7 @@ GEM
       addressable
     webrick (1.9.1)
     yajl-ruby (1.4.3)
+    zstd-ruby (1.5.7.1)
 
 PLATFORMS
   ruby
@@ -329,7 +373,7 @@ DEPENDENCIES
   fluent-plugin-aliyun-oss (= 0.0.1)
   fluent-plugin-cloudwatch-logs (= 0.15.0)
   fluent-plugin-datadog (= 0.14.4)
-  fluent-plugin-elasticsearch (= 5.4.4)
+  fluent-plugin-elasticsearch (= 6.0.0)
   fluent-plugin-gelf-best (= 1.4.1)
   fluent-plugin-grafana-loki (= 1.2.20)
   fluent-plugin-kafka (= 0.19.4)