Merge pull request #2010 from jcantrill/1886856

Bug 1886856: Add typhoeus for keep-alives in elasticsearch plugin

Author: openshift-merge-robot

fluentd/Gemfile

@@ -14,9 +14,11 @@ gem 'fluent-plugin-systemd'
 gem 'fluent-plugin-remote-syslog'
 gem 'fluent-plugin-prometheus'
 gem 'fluent-plugin-splunk-hec'
+gem 'typhoeus'
 
 #Below gem(and two of its dependencies) are moved to O_A_L/fluentd/lib, but its dependencies still exist in O_A_L/fluentd/vendored_gem_src/
 #gem 'fluent-plugin-remote_syslog', '1.0.0'
 
 gem 'ffi', '1.11.3'
 gem 'uuidtools', '2.1.5'
+gem 'rake'

fluentd/Gemfile.lock

@@ -19,6 +19,8 @@ GEM
     elasticsearch-transport (7.8.0)
       faraday (~> 1)
       multi_json
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
     excon (0.75.0)
     faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
@@ -129,6 +131,8 @@ GEM
     systemd-journal (1.3.3)
       ffi (~> 1.9)
     to_regexp (0.2.1)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
     tzinfo (2.0.2)
       concurrent-ruby (~> 1.0)
     tzinfo-data (1.2020.1)
@@ -159,6 +163,8 @@ DEPENDENCIES
   fluent-plugin-splunk-hec
   fluent-plugin-systemd
   fluentd (= 1.7.4)!
+  rake
+  typhoeus
   uuidtools (= 2.1.5)
 
 BUNDLED WITH

fluentd/rh-manifest.txt

@@ -20,6 +20,7 @@ rubygem-domain_name 0.5.20190701 https://github.com/knu/ruby-domain_name
 rubygem-elasticsearch 7.8.0 https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
 rubygem-elasticsearch-api 7.8.0 https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
 rubygem-elasticsearch-transport 7.8.0 https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/7.x/index.html
+rubygem-ethon 0.12.0 https://github.com/typhoeus/ethon
 rubygem-excon 0.75.0 https://github.com/excon/excon
 rubygem-faraday 1.0.1 https://lostisland.github.io/faraday
 rubygem-ffi 1.11.3 https://github.com/ffi/ffi/wiki
@@ -53,6 +54,7 @@ rubygem-rest-client 2.1.0 https://github.com/rest-client/rest-client
 rubygem-sigdump 0.2.4 https://github.com/frsyuki/sigdump
 rubygem-syslog_protocol 0.9.2 https://github.com/eric/syslog_protocol
 rubygem-systemd-journal 1.3.3 https://github.com/ledbettj/systemd-journal
+rubygem-typhoeus 1.4.0 https://github.com/typhoeus/typhoeus
 rubygem-tzinfo 2.0.2 https://tzinfo.github.io
 rubygem-tzinfo-data 1.2020.1 https://tzinfo.github.io
 rubygem-unf 0.1.4 https://github.com/knu/ruby-unf

fluentd/vendored_gem_src/ethon/.rspec

@@ -0,0 +1,3 @@
+--tty
+--color
+--format documentation

fluentd/vendored_gem_src/ethon/.travis.yml

@@ -0,0 +1,30 @@
+language: ruby
+cache: bundler
+sudo: false
+
+bundler_args: --without perf
+script: bundle exec rake
+before_install:
+  - gem install bundler
+
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0-p648
+  - 2.1.10
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
+  - ruby-head
+  - ree
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ree
+    - rvm: ruby-head
+    - rvm: jruby-head