From 3df8ddeb1f65f7c95b0e299e492aaa90afbe4c44 Mon Sep 17 00:00:00 2001 From: Alexander Vollschwitz Date: Thu, 24 Mar 2022 16:49:13 +0100 Subject: [PATCH] re-added fluentd Splunk HEC plugin (#307) (#309) Signed-off-by: Alexander Vollschwitz --- README.md | 5 +---- base-image/Gemfile | 4 +--- base-image/Gemfile.lock | 6 ++++++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d7bdb8db..c0a5ce5e 100644 --- a/README.md +++ b/README.md @@ -694,6 +694,7 @@ This projects tries to keep up with major releases for [Fluentd docker image](ht * fluent-plugin-s3 (1.6.1) * fluent-plugin-secure-forward (0.4.5) * fluent-plugin-splunkhec (2.1) +* fluent-plugin-splunk-hec (1.2.10) * fluent-plugin-sumologic_output (1.7.2) * fluent-plugin-systemd (1.0.5) * fluent-plugin-uri-parser (0.3.0) @@ -701,10 +702,6 @@ This projects tries to keep up with major releases for [Fluentd docker image](ht * 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) - 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 index fbb29996..76f7ec92 100644 --- a/base-image/Gemfile +++ b/base-image/Gemfile @@ -40,9 +40,7 @@ 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" -#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-splunk-hec', "1.2.10" gem 'fluent-plugin-splunkhec', "2.2" gem 'fluent-plugin-sumologic_output', "1.7.3" gem 'fluent-plugin-systemd', "1.0.5" diff --git a/base-image/Gemfile.lock b/base-image/Gemfile.lock index abb80712..6aff9d7a 100644 --- a/base-image/Gemfile.lock +++ b/base-image/Gemfile.lock @@ -183,6 +183,12 @@ GEM fluent-plugin-splunkhec (2.2) fluentd (>= 1.9.0, < 2) yajl-ruby (>= 1.4.0) + fluent-plugin-splunk-hec (1.2.10) + fluentd (>= 1.4) + multi_json (~> 1.13) + net-http-persistent (~> 3.1) + openid_connect (~> 1.1.8) + prometheus-client (>= 2.1.0) fluent-plugin-sumologic_output (1.7.3) fluentd (>= 0.14.12) httpclient (~> 2.8.0)