fix(plugins): remove splunk plugins for #266

- resolves #266 temporarily - deprecating the splunk plugins because of issues Signed-off-by: Anton Ouzounov <aouzounov@vmware.com>
vmware · Oct 19, 2021 · 35ff25f · 35ff25f
1 parent 6f8b73d
commit 35ff25f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 80 deletions.
diff --git a/README.md b/README.md
@@ -673,7 +673,7 @@ This projects tries to keep up with major releases for [Fluentd docker image](ht
 * fluent-plugin-kubernetes_metadata_filter (2.9.1)
 * fluent-plugin-kubernetes_sumologic (2.4.2)
 * fluent-plugin-logentries (0.2.10)
-* fluent-plugin-loggly (1.0.0)
+* fluent-plugin-loggly (1.0.0) - forked to fix for new fluentd api
 * fluent-plugin-logzio (0.0.21)
 * fluent-plugin-mail (0.3.0)
 * fluent-plugin-mongo (1.5.0)
@@ -690,15 +690,18 @@ 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-splunk-hec (1.2.7)
-* fluent-plugin-splunkhec (2.0)
 * fluent-plugin-sumologic_output (1.7.2)
 * fluent-plugin-systemd (1.0.5)
 * fluent-plugin-uri-parser (0.3.0)
 * fluent-plugin-verticajson (0.0.6)
 * fluent-plugin-vmware-log-intelligence (2.0.6)
 * fluent-plugin-vmware-loginsight (1.0.0)
 
+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.
 
 If you need other destination plugins you are welcome to contribute a patch or just create an issue.

diff --git a/base-image/Gemfile b/base-image/Gemfile
@@ -39,9 +39,10 @@ gem 'fluent-plugin-remote_syslog', "1.0.0"
 gem 'fluent-plugin-rewrite-tag-filter', "2.4.0"
 gem 'fluent-plugin-route', "1.0.0"
 gem 'fluent-plugin-s3', "1.6.1"
-gem 'fluent-plugin-secure-forward', "0.4.5"
-gem 'fluent-plugin-splunk-hec', "1.2.7"
-gem 'fluent-plugin-splunkhec', "2.0"
+#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-sumologic_output', "1.7.2"
 gem 'fluent-plugin-systemd', "1.0.5"
 gem 'fluent-plugin-uri-parser', "0.3.0"

diff --git a/base-image/Gemfile.lock b/base-image/Gemfile.lock
@@ -1,23 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activesupport (6.1.4.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aes_key_wrap (1.1.0)
     amq-protocol (2.3.2)
-    attr_required (1.0.1)
     aws-eventstream (1.2.0)
     aws-partitions (1.516.0)
-    aws-sdk-cloudwatchlogs (1.45.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-cloudwatchlogs (1.46.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
     aws-sdk-core (3.121.2)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -27,8 +17,8 @@ GEM
     aws-sdk-firehose (1.43.0)
       aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kinesis (1.35.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-kinesis (1.36.0)
+      aws-sdk-core (~> 3, >= 3.121.2)
       aws-sigv4 (~> 1.1)
     aws-sdk-kms (1.50.0)
       aws-sdk-core (~> 3, >= 3.121.2)
@@ -44,7 +34,6 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     azure-loganalytics-datacollector-api (0.5.0)
       rest-client
-    bindata (2.4.10)
     bson (4.12.1)
     bunny (2.19.0)
       amq-protocol (~> 2.3, >= 2.3.1)
@@ -189,19 +178,6 @@ GEM
       aws-sdk-s3 (~> 1.60)
       aws-sdk-sqs (~> 1.23)
       fluentd (>= 0.14.22, < 2)
-    fluent-plugin-secure-forward (0.4.5)
-      fluentd (>= 0.10.46)
-      proxifier
-      resolve-hostname
-    fluent-plugin-splunk-hec (1.2.7)
-      fluentd (>= 1.4)
-      multi_json (~> 1.13)
-      net-http-persistent (~> 3.1)
-      openid_connect (~> 1.1.8)
-      prometheus-client (>= 2.1.0)
-    fluent-plugin-splunkhec (2.0)
-      fluentd (>= 0.14.15, < 2)
-      yajl-ruby (>= 1.3.0)
     fluent-plugin-sumologic_output (1.7.2)
       fluentd (>= 0.14.12)
       httpclient (~> 2.8.0)
@@ -250,14 +226,8 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.7.0)
     httpclient (2.8.3)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.6.0)
-    json-jwt (1.13.0)
-      activesupport (>= 4.2)
-      aes_key_wrap
-      bindata
     jsonpath (1.1.0)
       multi_json
     kubeclient (4.9.2)
@@ -268,13 +238,9 @@ GEM
     logfmt (0.0.9)
     lru_redux (1.1.0)
     ltsv (0.1.2)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0901)
-    mini_mime (1.1.2)
-    minitest (5.14.4)
     mongo (2.6.4)
       bson (>= 4.3.0, < 5.0.0)
     msgpack (1.4.2)
@@ -285,33 +251,14 @@ GEM
       connection_pool (~> 2.2)
     netrc (0.11.0)
     oj (3.11.8)
-    openid_connect (1.1.8)
-      activemodel
-      attr_required (>= 1.0.0)
-      json-jwt (>= 1.5.0)
-      rack-oauth2 (>= 1.6.1)
-      swd (>= 1.0.0)
-      tzinfo
-      validate_email
-      validate_url
-      webfinger (>= 1.0.1)
     prometheus-client (2.1.0)
-    proxifier (1.0.3)
     public_suffix (4.0.6)
-    rack (2.2.3)
-    rack-oauth2 (1.19.0)
-      activesupport
-      attr_required
-      httpclient
-      json-jwt (>= 1.11.0)
-      rack (>= 2.1.0)
     rake (13.0.6)
     rbtree (0.4.4)
     recursive-open-struct (1.1.3)
     redis (3.3.5)
     remote_syslog_sender (1.2.2)
       syslog_protocol
-    resolve-hostname (0.1.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
@@ -328,10 +275,6 @@ GEM
       rbtree
       set (~> 1.0)
     strptime (0.2.5)
-    swd (1.3.0)
-      activesupport (>= 3)
-      attr_required (>= 0.0.5)
-      httpclient (>= 2.4)
     syslog_protocol (0.9.2)
     systemd-journal (1.4.2)
       ffi (~> 1.9)
@@ -343,19 +286,9 @@ GEM
       unf_ext
     unf_ext (0.0.8)
     uuidtools (2.2.0)
-    validate_email (0.1.6)
-      activemodel (>= 3.0)
-      mail (>= 2.2.5)
-    validate_url (1.0.13)
-      activemodel (>= 3.0.0)
-      public_suffix
     vertica (1.0.3)
-    webfinger (1.2.0)
-      activesupport
-      httpclient (>= 2.4)
     webrick (1.7.0)
     yajl-ruby (1.4.1)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   x86_64-darwin-20
@@ -394,9 +327,6 @@ DEPENDENCIES
   fluent-plugin-rewrite-tag-filter (= 2.4.0)
   fluent-plugin-route (= 1.0.0)
   fluent-plugin-s3 (= 1.6.1)
-  fluent-plugin-secure-forward (= 0.4.5)
-  fluent-plugin-splunk-hec (= 1.2.7)
-  fluent-plugin-splunkhec (= 2.0)
   fluent-plugin-sumologic_output (= 1.7.2)
   fluent-plugin-systemd (= 1.0.5)
   fluent-plugin-uri-parser (= 0.3.0)