Merge pull request #281 from Cryptophobia/master

fix(plugins): add back splunkhec 2.1 plugin

README.md

@@ -690,6 +690,7 @@ This projects tries to keep up with major releases for [Fluentd docker image](ht
 * fluent-plugin-route (1.0.0)
 * fluent-plugin-s3 (1.6.1)
 * fluent-plugin-secure-forward (0.4.5)
+* fluent-plugin-splunkhec (2.1)
 * fluent-plugin-sumologic_output (1.7.2)
 * fluent-plugin-systemd (1.0.5)
 * fluent-plugin-uri-parser (0.3.0)
@@ -700,7 +701,6 @@ This projects tries to keep up with major releases for [Fluentd docker image](ht
 DEPRECATIONS (these are deprecated until fixed - [#266](https://github.com/vmware/kube-fluentd-operator/issues/266)):
 
 * fluent-plugin-splunk-hec (1.2.7)
-* fluent-plugin-splunkhec (2.0)
 
 When customizing the image be careful not to uninstall plugins that are used internally to implement the macros.
 

base-image/Dockerfile

@@ -46,7 +46,7 @@ RUN git clone git://github.com/rbenv/ruby-build.git $RUBY_PATH/plugins/ruby-buil
     && $RUBY_PATH/plugins/ruby-build/install.sh \
     && ruby-build $RUBY_VERSION $RUBY_PATH/ \
     && gem update --system --no-document \
-    && gem install bundler -v '>= 2.2.29' --default --no-document \
+    && gem install bundler -v '>= 2.2.30' --default --no-document \
     && gem install rexml -v '>= 3.2.5' --default --no-document \
     && gem install rdoc -v '>= 6.3.2' --default --no-document \
     && gem install json -v '>= 2.6.0' --default --no-document \

base-image/Gemfile

@@ -43,7 +43,7 @@ gem 'fluent-plugin-s3', "1.6.1"
 #DEPRECATION: Until issues in #266 are fixed, we are deprecating these two plugins:
 #https://github.com/vmware/kube-fluentd-operator/issues/266
 #gem 'fluent-plugin-splunk-hec', "1.2.7"
-#gem 'fluent-plugin-splunkhec', "2.0"
+gem 'fluent-plugin-splunkhec', "2.1"
 gem 'fluent-plugin-sumologic_output', "1.7.2"
 gem 'fluent-plugin-systemd', "1.0.5"
 gem 'fluent-plugin-uri-parser', "0.3.0"

base-image/Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       public_suffix (>= 2.0.2, < 5.0)
     amq-protocol (2.3.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.518.0)
+    aws-partitions (1.519.0)
     aws-sdk-cloudwatchlogs (1.46.0)
       aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
@@ -176,6 +176,9 @@ GEM
       aws-sdk-s3 (~> 1.60)
       aws-sdk-sqs (~> 1.23)
       fluentd (>= 0.14.22, < 2)
+    fluent-plugin-splunkhec (2.1)
+      fluentd (>= 1.9.0, < 2)
+      yajl-ruby (>= 1.4.0)
     fluent-plugin-sumologic_output (1.7.2)
       fluentd (>= 0.14.12)
       httpclient (~> 2.8.0)
@@ -225,7 +228,7 @@ GEM
     http_parser.rb (0.7.0)
     httpclient (2.8.3)
     jmespath (1.4.0)
-    json (2.6.0)
+    json (2.6.1)
     jsonpath (1.1.0)
       multi_json
     kubeclient (4.9.2)
@@ -267,7 +270,7 @@ GEM
     ruby2_keywords (0.0.5)
     serverengine (2.2.4)
       sigdump (~> 0.2.2)
-    set (1.0.1)
+    set (1.0.2)
     sigdump (0.2.4)
     sorted_set (1.0.3)
       rbtree
@@ -278,7 +281,7 @@ GEM
       ffi (~> 1.9)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.4)
+    tzinfo-data (1.2021.5)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -324,6 +327,7 @@ DEPENDENCIES
   fluent-plugin-rewrite-tag-filter (= 2.4.0)
   fluent-plugin-route (= 1.0.0)
   fluent-plugin-s3 (= 1.6.1)
+  fluent-plugin-splunkhec (= 2.1)
   fluent-plugin-sumologic_output (= 1.7.2)
   fluent-plugin-systemd (= 1.0.5)
   fluent-plugin-uri-parser (= 0.3.0)
@@ -337,4 +341,4 @@ DEPENDENCIES
   oj (= 3.11.8)
 
 BUNDLED WITH
-   2.2.29
+   2.2.30

base-image/basegems/Gemfile

@@ -28,6 +28,6 @@ gem 'thwait'
 gem 'unf_ext'
 gem 'xmlrpc', '0.3.0'
 gem 'webrick'
-gem 'bundler', '>= 2.2.29'
+gem 'bundler', '>= 2.2.30'
 gem 'rake', '13.0.6'
 gem 'resolv', '0.2.1'

base-image/basegems/Gemfile.lock

@@ -65,7 +65,7 @@ DEPENDENCIES
   async-io (= 1.28.0)
   async-pool (= 0.2.0)
   bigdecimal
-  bundler (>= 2.2.29)
+  bundler (>= 2.2.30)
   did_you_mean (= 1.3.0)
   ext_monitor (= 0.1.2)
   json (= 2.6.0)
@@ -93,4 +93,4 @@ DEPENDENCIES
   xmlrpc (= 0.3.0)
 
 BUNDLED WITH
-   2.2.29
+   2.2.30