From cf1977acf04781f7a52b53707ac9a3b9706ccdb2 Mon Sep 17 00:00:00 2001
From: David <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 10:50:46 +0200
Subject: [PATCH 01/18] add Gemfile to install ruby gems

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.15-ruby3/Gemfile | 78 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 v1.15-ruby3/Gemfile

diff --git a/v1.15-ruby3/Gemfile b/v1.15-ruby3/Gemfile
new file mode 100644
index 0000000..811e15d
--- /dev/null
+++ b/v1.15-ruby3/Gemfile
@@ -0,0 +1,78 @@
+source 'https://rubygems.org'
+
+gem "oj", "3.14.2"
+gem "activesupport", "6.1.7"
+gem "http_parser.rb", "0.8.0"
+gem "tzinfo", "1.2.11"
+gem "resolv", "0.2.2"
+gem "json", "2.6.3"
+gem "yajl-ruby", "1.4.1"
+gem "async", "1.31.0"
+gem "async-http", "0.60.1"
+gem "fluentd", "${FLUENTD_VERSION}"
+gem "prometheus-client", "4.1.0"
+gem "bigdecimal", "3.1.4"
+gem "webrick", "1.8.1"
+gem "gelf", "3.1.0"
+gem "elasticsearch", "8.6.0"
+gem "elasticsearch-xpack", "7.17.7"
+gem "snappy", "0.2.0"
+gem "fluent-plugin-detect-exceptions", "0.0.15"
+# gem "specific_install", "0.3.8"
+gem "fluent-plugin-remote-syslog", "1.1.0"
+gem "fluent-plugin-webhdfs", "1.5.0"
+gem "fluent-plugin-prometheus", "2.0.3"
+gem "fluent-plugin-s3", "1.7.2"
+gem "fluent-plugin-rewrite-tag-filter", "2.4.0"
+gem "fluent-plugin-azure-storage-append-blob", "0.2.1"
+gem "fluent-plugin-aliyun-oss", "0.0.1"
+gem "fluent-plugin-dedot_filter", "1.0.0"
+gem "fluent-plugin-sumologic_output", "1.8.0"
+gem "fluent-plugin-kafka", "0.18.1"
+gem "fluent-plugin-geoip", "1.3.2"
+gem "fluent-plugin-tag-normaliser", "0.1.2"
+gem "fluent-plugin-grafana-loki", "1.2.20"
+gem "fluent-plugin-concat", "2.5.0"
+gem "fluent-plugin-kinesis", "3.4.2"
+gem "fluent-plugin-parser-logfmt", "0.0.0"
+gem "fluent-plugin-multi-format-parser", "1.0.0"
+gem "fluent-plugin-record-modifier", "2.1.1"
+gem "fluent-plugin-splunk-hec", "1.3.2"
+gem "fluent-plugin-elasticsearch", "5.3.0"
+gem "fluent-plugin-newrelic", "1.2.2"
+gem "fluent-plugin-cloudwatch-logs", "0.14.3"
+gem "fluent-plugin-opensearch", "1.1.2"
+gem "fluent-plugin-aws-elasticsearch-service", "2.4.1"
+gem "fluent-plugin-kube-events-timestamp", "0.1.3"
+gem "fluent-plugin-grok-parser", "2.6.2"
+gem "fluent-plugin-throttle", "0.0.5"
+gem "fluent-plugin-logdna", "0.4.0"
+gem "fluent-plugin-datadog", "0.14.2"
+gem "fluent-plugin-redis", "0.3.5"
+gem "fluent-plugin-gelf-hs", "1.0.8"
+gem "fluent-plugin-sqs", "3.0.0"
+gem "fluent-plugin-mattermost", "0.2.2"
+gem "fluent-plugin-vmware-loginsight", "1.4.0" \
+gem "fluent-plugin-vmware-log-intelligence", "2.0.6" \
+gem "fluent-plugin-mysqlslowquery", "0.0.9" \
+gem "fluent-plugin-logzio", "0.0.22" \
+gem 'fluent-plugin-syslog_rfc5424', :git => 'https://github.com/acquia/fluent-plugin-syslog_rfc5424.git', :branch => 'main'
+# main branch
+# gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \
+gem 'fluent-plugin-gcs', :git => 'https://github.com/banzaicloud/fluent-plugin-gcs.git', :branch => 'master'
+# master branch
+# gem specific_install -l https://github.com/banzaicloud/fluent-plugin-gcs.git --ref 9fbff74734ddce289f9a10734a338b3c7f0065b5 \
+gem 'fluent-plugin-label-router', :git => 'https://github.com/kube-logging/fluent-plugin-label-router.git', :branch => 'rwlock'
+# rwlock branch
+# gem specific_install -l https://github.com/kube-logging/fluent-plugin-label-router.git --ref 2ff43789f895735b7852e0a1a809280e22d9e8ef \
+gem 'fluent-plugin-kubernetes-metadata-filter', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :branch => 'main', :glob => 'fluent-plugin-kubernetes-metadata-filter'
+gem 'fluent-plugin-enhance-k8s-metadata', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :branch => 'main', :glob => 'fluent-plugin-enhance-k8s-metadata'
+gem 'fluent-plugin-kubernetes-sumologic', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :branch => 'main', :glob => 'fluent-plugin-kubernetes-sumologic'
+# main branch
+# gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-metadata-filter \
+# gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-enhance-k8s-metadata \
+# gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-sumologic \
+
+gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :branch => 'master'
+# master branch
+# gem specific_install https://github.com/abonas/kubeclient --ref 6b40464cd71e2789ea6de94f618f793a8db9ac49 \
\ No newline at end of file

From 52e4d7410d12aac02ef31647de88ae1808665d39 Mon Sep 17 00:00:00 2001
From: David <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 10:55:43 +0200
Subject: [PATCH 02/18] replace ruby gem installation in dockerfile with bundle
 install

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.15-ruby3/Dockerfile | 71 +-----------------------------------------
 1 file changed, 1 insertion(+), 70 deletions(-)

diff --git a/v1.15-ruby3/Dockerfile b/v1.15-ruby3/Dockerfile
index 5325a3d..19b8c9f 100644
--- a/v1.15-ruby3/Dockerfile
+++ b/v1.15-ruby3/Dockerfile
@@ -25,76 +25,7 @@ RUN apk update \
         ruby-dev gnupg \
  && apk add $buildDeps \
  && echo 'gem: --no-document' >> /etc/gemrc \
- && gem install oj -v 3.14.2 \
- && gem install activesupport -v 6.1.7.3 \
- && gem install http_parser.rb -v 0.8.0 \
- && gem install tzinfo -v 1.2.11 \
- && gem install resolv -v 0.2.2 \
- && gem install json -v 2.6.3 \
- && gem install yajl-ruby -v 1.4.1 \
- && gem install async -v 1.31.0 \
- && gem install async-http -v 0.60.1 \
-  # removed as it is not available for ruby 3
-  # && gem install ext_monitor -v 0.1.2 \
- && gem install fluentd -v ${FLUENTD_VERSION} \
- && gem install prometheus-client -v 4.1.0 \
- && gem install bigdecimal -v 3.1.4 \
- && gem install webrick -v 1.8.1 \
- && gem install gelf -v 3.1.0 \
- && gem install elasticsearch -v 8.6.0 \
- && gem install elasticsearch-xpack -v 7.17.7 \
- && gem install snappy -v 0.2.0 \
- && gem install fluent-plugin-detect-exceptions -v 0.0.15 \
- && gem install specific_install -v 0.3.8 \
- && gem install fluent-plugin-remote-syslog -v 1.1.0 \
- && gem install fluent-plugin-webhdfs -v 1.5.0 \
- && gem install fluent-plugin-prometheus -v 2.0.3 \
- && gem install fluent-plugin-s3 -v 1.7.2 \
- && gem install fluent-plugin-rewrite-tag-filter -v 2.4.0 \
- && gem install fluent-plugin-azure-storage-append-blob -v 0.2.1 \
- && gem install fluent-plugin-aliyun-oss -v 0.0.1 \
- && gem install fluent-plugin-dedot_filter -v 1.0.0 \
- && gem install fluent-plugin-sumologic_output -v 1.8.0 \
- && gem install fluent-plugin-kafka -v 0.18.1 \
- && gem install fluent-plugin-geoip -v 1.3.2 \
- && gem install fluent-plugin-tag-normaliser -v 0.1.2 \
- && gem install fluent-plugin-grafana-loki -v 1.2.20 \
- && gem install fluent-plugin-concat -v 2.5.0 \
- && gem install fluent-plugin-kinesis -v 3.4.2 \
- && gem install fluent-plugin-parser-logfmt -v 0.0.0 \
- && gem install fluent-plugin-multi-format-parser -v 1.0.0 \
- && gem install fluent-plugin-record-modifier -v 2.1.1 \
- && gem install fluent-plugin-splunk-hec -v 1.3.2 \
- && gem install fluent-plugin-elasticsearch -v 5.3.0 \
- && gem install fluent-plugin-newrelic -v 1.2.2 \
- && gem install fluent-plugin-cloudwatch-logs -v 0.14.3 \
- && gem install fluent-plugin-opensearch -v 1.1.2 \
- && gem install fluent-plugin-aws-elasticsearch-service -v 2.4.1 \
- && gem install fluent-plugin-kube-events-timestamp -v 0.1.3 \
- && gem install fluent-plugin-grok-parser -v 2.6.2 \
- && gem install fluent-plugin-throttle -v 0.0.5 \
- && gem install fluent-plugin-logdna -v 0.4.0 \
- && gem install fluent-plugin-datadog -v 0.14.2 \
- && gem install fluent-plugin-redis -v 0.3.5 \
- && gem install fluent-plugin-gelf-hs -v 1.0.8 \
- && gem install fluent-plugin-sqs -v 3.0.0 \
- && gem install fluent-plugin-mattermost -v 0.2.2 \
- && gem install fluent-plugin-vmware-loginsight -v 1.4.0 \
- && gem install fluent-plugin-vmware-log-intelligence -v 2.0.6 \
- && gem install fluent-plugin-mysqlslowquery -v 0.0.9 \
- && gem install fluent-plugin-logzio -v 0.0.22 \
-  # main branch
- && gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \
-  # master branch
- && gem specific_install -l https://github.com/banzaicloud/fluent-plugin-gcs.git --ref 9fbff74734ddce289f9a10734a338b3c7f0065b5 \
-  # rwlock branch
- && gem specific_install -l https://github.com/kube-logging/fluent-plugin-label-router.git --ref 2ff43789f895735b7852e0a1a809280e22d9e8ef \
-  # main branch
- && gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-metadata-filter \
- && gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-enhance-k8s-metadata \
- && gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-sumologic \
-  # master branch
- && gem specific_install https://github.com/abonas/kubeclient --ref 6b40464cd71e2789ea6de94f618f793a8db9ac49 \
+ && bundle install
  && apk del .build-deps $buildDeps \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
 

From 4dfae097455dd285f722364e0a695a448ad446f0 Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 11:19:06 +0200
Subject: [PATCH 03/18] install bundler in dockerfile

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.15-ruby3/Dockerfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/v1.15-ruby3/Dockerfile b/v1.15-ruby3/Dockerfile
index 19b8c9f..9554a81 100644
--- a/v1.15-ruby3/Dockerfile
+++ b/v1.15-ruby3/Dockerfile
@@ -24,9 +24,10 @@ RUN apk update \
         build-base \
         ruby-dev gnupg \
  && apk add $buildDeps \
- && echo 'gem: --no-document' >> /etc/gemrc \
- && bundle install
- && apk del .build-deps $buildDeps \
+ && echo 'gem: --no-document' >> /etc/gemrc
+ADD ./Gemfile /Gemfile
+RUN gem install bundler && bundle install 
+RUN apk del .build-deps $buildDeps \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
 
 RUN addgroup -S fluent && adduser -S -G fluent fluent \

From c08892c554d1dc348f3bf19a289eb07f33686ca6 Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 11:19:36 +0200
Subject: [PATCH 04/18] pin git gems to ref instead of branch

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.15-ruby3/Gemfile | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/v1.15-ruby3/Gemfile b/v1.15-ruby3/Gemfile
index 811e15d..ee12dc9 100644
--- a/v1.15-ruby3/Gemfile
+++ b/v1.15-ruby3/Gemfile
@@ -9,7 +9,7 @@ gem "json", "2.6.3"
 gem "yajl-ruby", "1.4.1"
 gem "async", "1.31.0"
 gem "async-http", "0.60.1"
-gem "fluentd", "${FLUENTD_VERSION}"
+gem "fluentd", "1.15.3"
 gem "prometheus-client", "4.1.0"
 gem "bigdecimal", "3.1.4"
 gem "webrick", "1.8.1"
@@ -52,27 +52,27 @@ gem "fluent-plugin-redis", "0.3.5"
 gem "fluent-plugin-gelf-hs", "1.0.8"
 gem "fluent-plugin-sqs", "3.0.0"
 gem "fluent-plugin-mattermost", "0.2.2"
-gem "fluent-plugin-vmware-loginsight", "1.4.0" \
-gem "fluent-plugin-vmware-log-intelligence", "2.0.6" \
-gem "fluent-plugin-mysqlslowquery", "0.0.9" \
-gem "fluent-plugin-logzio", "0.0.22" \
-gem 'fluent-plugin-syslog_rfc5424', :git => 'https://github.com/acquia/fluent-plugin-syslog_rfc5424.git', :branch => 'main'
+gem "fluent-plugin-vmware-loginsight", "1.4.0"
+gem "fluent-plugin-vmware-log-intelligence", "2.0.6"
+gem "fluent-plugin-mysqlslowquery", "0.0.9"
+gem "fluent-plugin-logzio", "0.0.22"
+gem 'fluent-plugin-syslog_rfc5424', :git => 'https://github.com/acquia/fluent-plugin-syslog_rfc5424.git', :ref => '5199be67d1a385f529fa1d6b6023e95ba7fac27d'
 # main branch
 # gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \
-gem 'fluent-plugin-gcs', :git => 'https://github.com/banzaicloud/fluent-plugin-gcs.git', :branch => 'master'
+gem 'fluent-plugin-gcs', :git => 'https://github.com/banzaicloud/fluent-plugin-gcs.git', :ref => '9fbff74734ddce289f9a10734a338b3c7f0065b5'
 # master branch
 # gem specific_install -l https://github.com/banzaicloud/fluent-plugin-gcs.git --ref 9fbff74734ddce289f9a10734a338b3c7f0065b5 \
-gem 'fluent-plugin-label-router', :git => 'https://github.com/kube-logging/fluent-plugin-label-router.git', :branch => 'rwlock'
+gem 'fluent-plugin-label-router', :git => 'https://github.com/kube-logging/fluent-plugin-label-router.git', :ref => '2ff43789f895735b7852e0a1a809280e22d9e8ef'
 # rwlock branch
 # gem specific_install -l https://github.com/kube-logging/fluent-plugin-label-router.git --ref 2ff43789f895735b7852e0a1a809280e22d9e8ef \
-gem 'fluent-plugin-kubernetes-metadata-filter', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :branch => 'main', :glob => 'fluent-plugin-kubernetes-metadata-filter'
-gem 'fluent-plugin-enhance-k8s-metadata', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :branch => 'main', :glob => 'fluent-plugin-enhance-k8s-metadata'
-gem 'fluent-plugin-kubernetes-sumologic', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :branch => 'main', :glob => 'fluent-plugin-kubernetes-sumologic'
+gem 'fluent-plugin-kubernetes-metadata-filter', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :ref => '3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6', :glob => 'fluent-plugin-kubernetes-metadata-filter/*.gemspec'
+gem 'fluent-plugin-enhance-k8s-metadata', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :ref => '3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6', :glob => 'fluent-plugin-enhance-k8s-metadata/*.gemspec'
+gem 'fluent-plugin-kubernetes-sumologic', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :ref => '3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6', :glob => 'fluent-plugin-kubernetes-sumologic/*.gemspec'
 # main branch
 # gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-metadata-filter \
 # gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-enhance-k8s-metadata \
 # gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-sumologic \
 
-gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :branch => 'master'
+gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :ref => '6b40464cd71e2789ea6de94f618f793a8db9ac49'
 # master branch
 # gem specific_install https://github.com/abonas/kubeclient --ref 6b40464cd71e2789ea6de94f618f793a8db9ac49 \
\ No newline at end of file

From 7ba55bdb25a7b235d60756628d4675094688fbbb Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 18:03:21 +0200
Subject: [PATCH 05/18] reset v1.15-ruby3/ to upstream

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.15-ruby3/Dockerfile | 76 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 72 insertions(+), 4 deletions(-)

diff --git a/v1.15-ruby3/Dockerfile b/v1.15-ruby3/Dockerfile
index 9554a81..5325a3d 100644
--- a/v1.15-ruby3/Dockerfile
+++ b/v1.15-ruby3/Dockerfile
@@ -24,10 +24,78 @@ RUN apk update \
         build-base \
         ruby-dev gnupg \
  && apk add $buildDeps \
- && echo 'gem: --no-document' >> /etc/gemrc
-ADD ./Gemfile /Gemfile
-RUN gem install bundler && bundle install 
-RUN apk del .build-deps $buildDeps \
+ && echo 'gem: --no-document' >> /etc/gemrc \
+ && gem install oj -v 3.14.2 \
+ && gem install activesupport -v 6.1.7.3 \
+ && gem install http_parser.rb -v 0.8.0 \
+ && gem install tzinfo -v 1.2.11 \
+ && gem install resolv -v 0.2.2 \
+ && gem install json -v 2.6.3 \
+ && gem install yajl-ruby -v 1.4.1 \
+ && gem install async -v 1.31.0 \
+ && gem install async-http -v 0.60.1 \
+  # removed as it is not available for ruby 3
+  # && gem install ext_monitor -v 0.1.2 \
+ && gem install fluentd -v ${FLUENTD_VERSION} \
+ && gem install prometheus-client -v 4.1.0 \
+ && gem install bigdecimal -v 3.1.4 \
+ && gem install webrick -v 1.8.1 \
+ && gem install gelf -v 3.1.0 \
+ && gem install elasticsearch -v 8.6.0 \
+ && gem install elasticsearch-xpack -v 7.17.7 \
+ && gem install snappy -v 0.2.0 \
+ && gem install fluent-plugin-detect-exceptions -v 0.0.15 \
+ && gem install specific_install -v 0.3.8 \
+ && gem install fluent-plugin-remote-syslog -v 1.1.0 \
+ && gem install fluent-plugin-webhdfs -v 1.5.0 \
+ && gem install fluent-plugin-prometheus -v 2.0.3 \
+ && gem install fluent-plugin-s3 -v 1.7.2 \
+ && gem install fluent-plugin-rewrite-tag-filter -v 2.4.0 \
+ && gem install fluent-plugin-azure-storage-append-blob -v 0.2.1 \
+ && gem install fluent-plugin-aliyun-oss -v 0.0.1 \
+ && gem install fluent-plugin-dedot_filter -v 1.0.0 \
+ && gem install fluent-plugin-sumologic_output -v 1.8.0 \
+ && gem install fluent-plugin-kafka -v 0.18.1 \
+ && gem install fluent-plugin-geoip -v 1.3.2 \
+ && gem install fluent-plugin-tag-normaliser -v 0.1.2 \
+ && gem install fluent-plugin-grafana-loki -v 1.2.20 \
+ && gem install fluent-plugin-concat -v 2.5.0 \
+ && gem install fluent-plugin-kinesis -v 3.4.2 \
+ && gem install fluent-plugin-parser-logfmt -v 0.0.0 \
+ && gem install fluent-plugin-multi-format-parser -v 1.0.0 \
+ && gem install fluent-plugin-record-modifier -v 2.1.1 \
+ && gem install fluent-plugin-splunk-hec -v 1.3.2 \
+ && gem install fluent-plugin-elasticsearch -v 5.3.0 \
+ && gem install fluent-plugin-newrelic -v 1.2.2 \
+ && gem install fluent-plugin-cloudwatch-logs -v 0.14.3 \
+ && gem install fluent-plugin-opensearch -v 1.1.2 \
+ && gem install fluent-plugin-aws-elasticsearch-service -v 2.4.1 \
+ && gem install fluent-plugin-kube-events-timestamp -v 0.1.3 \
+ && gem install fluent-plugin-grok-parser -v 2.6.2 \
+ && gem install fluent-plugin-throttle -v 0.0.5 \
+ && gem install fluent-plugin-logdna -v 0.4.0 \
+ && gem install fluent-plugin-datadog -v 0.14.2 \
+ && gem install fluent-plugin-redis -v 0.3.5 \
+ && gem install fluent-plugin-gelf-hs -v 1.0.8 \
+ && gem install fluent-plugin-sqs -v 3.0.0 \
+ && gem install fluent-plugin-mattermost -v 0.2.2 \
+ && gem install fluent-plugin-vmware-loginsight -v 1.4.0 \
+ && gem install fluent-plugin-vmware-log-intelligence -v 2.0.6 \
+ && gem install fluent-plugin-mysqlslowquery -v 0.0.9 \
+ && gem install fluent-plugin-logzio -v 0.0.22 \
+  # main branch
+ && gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \
+  # master branch
+ && gem specific_install -l https://github.com/banzaicloud/fluent-plugin-gcs.git --ref 9fbff74734ddce289f9a10734a338b3c7f0065b5 \
+  # rwlock branch
+ && gem specific_install -l https://github.com/kube-logging/fluent-plugin-label-router.git --ref 2ff43789f895735b7852e0a1a809280e22d9e8ef \
+  # main branch
+ && gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-metadata-filter \
+ && gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-enhance-k8s-metadata \
+ && gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-sumologic \
+  # master branch
+ && gem specific_install https://github.com/abonas/kubeclient --ref 6b40464cd71e2789ea6de94f618f793a8db9ac49 \
+ && apk del .build-deps $buildDeps \
  && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
 
 RUN addgroup -S fluent && adduser -S -G fluent fluent \

From 49ca11dbd2c0b7a9d33b76cba499c69b346d293c Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 18:05:39 +0200
Subject: [PATCH 06/18] add new image dir v1.16-staging

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.16-staging/Dockerfile    | 55 ++++++++++++++++++++++++++
 v1.16-staging/Gemfile       | 78 +++++++++++++++++++++++++++++++++++++
 v1.16-staging/entrypoint.sh | 28 +++++++++++++
 v1.16-staging/fluent.conf   |  8 ++++
 v1.16-staging/healthy.sh    | 23 +++++++++++
 5 files changed, 192 insertions(+)
 create mode 100644 v1.16-staging/Dockerfile
 create mode 100644 v1.16-staging/Gemfile
 create mode 100755 v1.16-staging/entrypoint.sh
 create mode 100644 v1.16-staging/fluent.conf
 create mode 100755 v1.16-staging/healthy.sh

diff --git a/v1.16-staging/Dockerfile b/v1.16-staging/Dockerfile
new file mode 100644
index 0000000..9554a81
--- /dev/null
+++ b/v1.16-staging/Dockerfile
@@ -0,0 +1,55 @@
+FROM alpine:3.18
+
+ENV FLUENTD_VERSION 1.15.3
+
+LABEL Description="Fluentd docker image" Vendor="Kube logging" Version="${FLUENTD_VERSION}"
+
+# Do not split this into multiple RUN!
+# Docker creates a layer for every RUN-Statement
+# therefore an 'apk delete' has no effect
+RUN apk update \
+ && apk add --no-cache \
+        ca-certificates \
+        ruby ruby-irb ruby-etc \
+        tini libmaxminddb geoip \
+        snappy \
+ && buildDeps=" \
+      make gcc g++ libc-dev \
+      wget bzip2 zlib-dev git linux-headers \
+      automake autoconf libtool build-base \
+      ruby-dev libc6-compat geoip-dev \
+      snappy-dev \
+    " \
+ && apk add --no-cache --virtual .build-deps \
+        build-base \
+        ruby-dev gnupg \
+ && apk add $buildDeps \
+ && echo 'gem: --no-document' >> /etc/gemrc
+ADD ./Gemfile /Gemfile
+RUN gem install bundler && bundle install 
+RUN apk del .build-deps $buildDeps \
+ && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem /usr/lib/ruby/gems/3.*/gems/fluentd-*/test
+
+RUN addgroup -S fluent && adduser -S -G fluent fluent \
+    # for log storage (maybe shared with host)
+    && mkdir -p /fluentd/log \
+    # configuration/plugins path (default: copied from .)
+    && mkdir -p /fluentd/etc /fluentd/plugins \
+    && chown -R fluent /fluentd && chgrp -R fluent /fluentd \
+    && mkdir -p /buffers && chown -R fluent /buffers
+
+
+COPY fluent.conf /fluentd/etc/
+COPY entrypoint.sh /bin/
+COPY healthy.sh /bin/
+
+
+ENV FLUENTD_CONF="fluent.conf"
+ENV RUBYLIB="/usr/lib/ruby/gems/3.1.0/gems/resolv-0.2.2/lib"
+
+ENV LD_PRELOAD=""
+EXPOSE 24224 5140
+
+USER fluent
+ENTRYPOINT ["tini",  "--", "/bin/entrypoint.sh"]
+CMD ["fluentd"]
diff --git a/v1.16-staging/Gemfile b/v1.16-staging/Gemfile
new file mode 100644
index 0000000..ee12dc9
--- /dev/null
+++ b/v1.16-staging/Gemfile
@@ -0,0 +1,78 @@
+source 'https://rubygems.org'
+
+gem "oj", "3.14.2"
+gem "activesupport", "6.1.7"
+gem "http_parser.rb", "0.8.0"
+gem "tzinfo", "1.2.11"
+gem "resolv", "0.2.2"
+gem "json", "2.6.3"
+gem "yajl-ruby", "1.4.1"
+gem "async", "1.31.0"
+gem "async-http", "0.60.1"
+gem "fluentd", "1.15.3"
+gem "prometheus-client", "4.1.0"
+gem "bigdecimal", "3.1.4"
+gem "webrick", "1.8.1"
+gem "gelf", "3.1.0"
+gem "elasticsearch", "8.6.0"
+gem "elasticsearch-xpack", "7.17.7"
+gem "snappy", "0.2.0"
+gem "fluent-plugin-detect-exceptions", "0.0.15"
+# gem "specific_install", "0.3.8"
+gem "fluent-plugin-remote-syslog", "1.1.0"
+gem "fluent-plugin-webhdfs", "1.5.0"
+gem "fluent-plugin-prometheus", "2.0.3"
+gem "fluent-plugin-s3", "1.7.2"
+gem "fluent-plugin-rewrite-tag-filter", "2.4.0"
+gem "fluent-plugin-azure-storage-append-blob", "0.2.1"
+gem "fluent-plugin-aliyun-oss", "0.0.1"
+gem "fluent-plugin-dedot_filter", "1.0.0"
+gem "fluent-plugin-sumologic_output", "1.8.0"
+gem "fluent-plugin-kafka", "0.18.1"
+gem "fluent-plugin-geoip", "1.3.2"
+gem "fluent-plugin-tag-normaliser", "0.1.2"
+gem "fluent-plugin-grafana-loki", "1.2.20"
+gem "fluent-plugin-concat", "2.5.0"
+gem "fluent-plugin-kinesis", "3.4.2"
+gem "fluent-plugin-parser-logfmt", "0.0.0"
+gem "fluent-plugin-multi-format-parser", "1.0.0"
+gem "fluent-plugin-record-modifier", "2.1.1"
+gem "fluent-plugin-splunk-hec", "1.3.2"
+gem "fluent-plugin-elasticsearch", "5.3.0"
+gem "fluent-plugin-newrelic", "1.2.2"
+gem "fluent-plugin-cloudwatch-logs", "0.14.3"
+gem "fluent-plugin-opensearch", "1.1.2"
+gem "fluent-plugin-aws-elasticsearch-service", "2.4.1"
+gem "fluent-plugin-kube-events-timestamp", "0.1.3"
+gem "fluent-plugin-grok-parser", "2.6.2"
+gem "fluent-plugin-throttle", "0.0.5"
+gem "fluent-plugin-logdna", "0.4.0"
+gem "fluent-plugin-datadog", "0.14.2"
+gem "fluent-plugin-redis", "0.3.5"
+gem "fluent-plugin-gelf-hs", "1.0.8"
+gem "fluent-plugin-sqs", "3.0.0"
+gem "fluent-plugin-mattermost", "0.2.2"
+gem "fluent-plugin-vmware-loginsight", "1.4.0"
+gem "fluent-plugin-vmware-log-intelligence", "2.0.6"
+gem "fluent-plugin-mysqlslowquery", "0.0.9"
+gem "fluent-plugin-logzio", "0.0.22"
+gem 'fluent-plugin-syslog_rfc5424', :git => 'https://github.com/acquia/fluent-plugin-syslog_rfc5424.git', :ref => '5199be67d1a385f529fa1d6b6023e95ba7fac27d'
+# main branch
+# gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \
+gem 'fluent-plugin-gcs', :git => 'https://github.com/banzaicloud/fluent-plugin-gcs.git', :ref => '9fbff74734ddce289f9a10734a338b3c7f0065b5'
+# master branch
+# gem specific_install -l https://github.com/banzaicloud/fluent-plugin-gcs.git --ref 9fbff74734ddce289f9a10734a338b3c7f0065b5 \
+gem 'fluent-plugin-label-router', :git => 'https://github.com/kube-logging/fluent-plugin-label-router.git', :ref => '2ff43789f895735b7852e0a1a809280e22d9e8ef'
+# rwlock branch
+# gem specific_install -l https://github.com/kube-logging/fluent-plugin-label-router.git --ref 2ff43789f895735b7852e0a1a809280e22d9e8ef \
+gem 'fluent-plugin-kubernetes-metadata-filter', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :ref => '3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6', :glob => 'fluent-plugin-kubernetes-metadata-filter/*.gemspec'
+gem 'fluent-plugin-enhance-k8s-metadata', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :ref => '3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6', :glob => 'fluent-plugin-enhance-k8s-metadata/*.gemspec'
+gem 'fluent-plugin-kubernetes-sumologic', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :ref => '3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6', :glob => 'fluent-plugin-kubernetes-sumologic/*.gemspec'
+# main branch
+# gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-metadata-filter \
+# gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-enhance-k8s-metadata \
+# gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-sumologic \
+
+gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :ref => '6b40464cd71e2789ea6de94f618f793a8db9ac49'
+# master branch
+# gem specific_install https://github.com/abonas/kubeclient --ref 6b40464cd71e2789ea6de94f618f793a8db9ac49 \
\ No newline at end of file
diff --git a/v1.16-staging/entrypoint.sh b/v1.16-staging/entrypoint.sh
new file mode 100755
index 0000000..0850ff1
--- /dev/null
+++ b/v1.16-staging/entrypoint.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+#source vars if file exists
+DEFAULT=/etc/default/fluentd
+
+if [ -r $DEFAULT ]; then
+    set -o allexport
+    . $DEFAULT
+    set +o allexport
+fi
+
+# If the user has supplied only arguments append them to `fluentd` command
+if [ "${1#-}" != "$1" ]; then
+    set -- fluentd "$@"
+fi
+
+# If user does not supply config file or plugins, use the default
+if [ "$1" = "fluentd" ]; then
+    if ! echo $@ | grep ' \-c' ; then
+       set -- "$@" -c /fluentd/etc/${FLUENTD_CONF}
+    fi
+
+    if ! echo $@ | grep ' \-p' ; then
+       set -- "$@" -p /fluentd/plugins
+    fi
+fi
+
+exec "$@"
\ No newline at end of file
diff --git a/v1.16-staging/fluent.conf b/v1.16-staging/fluent.conf
new file mode 100644
index 0000000..04959f1
--- /dev/null
+++ b/v1.16-staging/fluent.conf
@@ -0,0 +1,8 @@
+# This is the root config file, which only includes components of the actual configuration
+
+# Do not collect fluentd's own logs to avoid infinite loops.
+<match fluent.**>
+  @type null
+</match>
+
+@include /fluentd/etc/conf.d/*.conf
diff --git a/v1.16-staging/healthy.sh b/v1.16-staging/healthy.sh
new file mode 100755
index 0000000..49587f9
--- /dev/null
+++ b/v1.16-staging/healthy.sh
@@ -0,0 +1,23 @@
+#!/bin/sh -x
+
+# Liveness probe is aimed to help in situations where fluentd
+# silently hangs for no apparent reasons until manual restart.
+# The idea of this probe is that if fluentd is not queueing or
+# flushing chunks for 5 minutes, something is not right. If
+# you want to change the fluentd configuration, reducing amount of
+# logs fluentd collects, consider changing the threshold or turning
+# liveness probe off completely.
+# soiurce https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml#L58
+
+BUFFER_PATH=${BUFFER_PATH};
+LIVENESS_THRESHOLD_SECONDS=${LIVENESS_THRESHOLD_SECONDS:-300};
+
+if [ ! -e ${BUFFER_PATH} ];
+then
+  exit 1;
+fi;
+touch -d "@$(($(date +%s) - $LIVENESS_THRESHOLD_SECONDS))" /tmp/marker-liveness;
+if [ -z "$(find ${BUFFER_PATH} -type d -newer /tmp/marker-liveness -print -quit)" ];
+then
+  exit 1;
+fi;

From d50045ce57c77439a10b71a2633e4a852216ba29 Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 18:21:32 +0200
Subject: [PATCH 07/18] update dependency fluentd to 1.16.2

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.16-staging/Dockerfile | 2 +-
 v1.16-staging/Gemfile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/v1.16-staging/Dockerfile b/v1.16-staging/Dockerfile
index 9554a81..2568cd2 100644
--- a/v1.16-staging/Dockerfile
+++ b/v1.16-staging/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.18
 
-ENV FLUENTD_VERSION 1.15.3
+ENV FLUENTD_VERSION 1.16.2
 
 LABEL Description="Fluentd docker image" Vendor="Kube logging" Version="${FLUENTD_VERSION}"
 
diff --git a/v1.16-staging/Gemfile b/v1.16-staging/Gemfile
index ee12dc9..f8c7c11 100644
--- a/v1.16-staging/Gemfile
+++ b/v1.16-staging/Gemfile
@@ -9,7 +9,7 @@ gem "json", "2.6.3"
 gem "yajl-ruby", "1.4.1"
 gem "async", "1.31.0"
 gem "async-http", "0.60.1"
-gem "fluentd", "1.15.3"
+gem 'fluentd', '1.16.2'
 gem "prometheus-client", "4.1.0"
 gem "bigdecimal", "3.1.4"
 gem "webrick", "1.8.1"

From 5851f1d994f2dc0d257bd1cf387b90cc3fdbb8e1 Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 18:22:14 +0200
Subject: [PATCH 08/18] pin git gem dependencies to tags instead of refs

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.16-staging/Gemfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/v1.16-staging/Gemfile b/v1.16-staging/Gemfile
index f8c7c11..f7bdce4 100644
--- a/v1.16-staging/Gemfile
+++ b/v1.16-staging/Gemfile
@@ -56,7 +56,7 @@ gem "fluent-plugin-vmware-loginsight", "1.4.0"
 gem "fluent-plugin-vmware-log-intelligence", "2.0.6"
 gem "fluent-plugin-mysqlslowquery", "0.0.9"
 gem "fluent-plugin-logzio", "0.0.22"
-gem 'fluent-plugin-syslog_rfc5424', :git => 'https://github.com/acquia/fluent-plugin-syslog_rfc5424.git', :ref => '5199be67d1a385f529fa1d6b6023e95ba7fac27d'
+gem 'fluent-plugin-syslog_rfc5424', :git => 'https://github.com/acquia/fluent-plugin-syslog_rfc5424.git', :tag => '0.2.1'
 # main branch
 # gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \
 gem 'fluent-plugin-gcs', :git => 'https://github.com/banzaicloud/fluent-plugin-gcs.git', :ref => '9fbff74734ddce289f9a10734a338b3c7f0065b5'
@@ -65,14 +65,14 @@ gem 'fluent-plugin-gcs', :git => 'https://github.com/banzaicloud/fluent-plugin-g
 gem 'fluent-plugin-label-router', :git => 'https://github.com/kube-logging/fluent-plugin-label-router.git', :ref => '2ff43789f895735b7852e0a1a809280e22d9e8ef'
 # rwlock branch
 # gem specific_install -l https://github.com/kube-logging/fluent-plugin-label-router.git --ref 2ff43789f895735b7852e0a1a809280e22d9e8ef \
-gem 'fluent-plugin-kubernetes-metadata-filter', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :ref => '3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6', :glob => 'fluent-plugin-kubernetes-metadata-filter/*.gemspec'
-gem 'fluent-plugin-enhance-k8s-metadata', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :ref => '3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6', :glob => 'fluent-plugin-enhance-k8s-metadata/*.gemspec'
-gem 'fluent-plugin-kubernetes-sumologic', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :ref => '3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6', :glob => 'fluent-plugin-kubernetes-sumologic/*.gemspec'
+gem 'fluent-plugin-kubernetes-metadata-filter', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-kubernetes-metadata-filter/*.gemspec'
+gem 'fluent-plugin-enhance-k8s-metadata', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-enhance-k8s-metadata/*.gemspec'
+gem 'fluent-plugin-kubernetes-sumologic', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-kubernetes-sumologic/*.gemspec'
 # main branch
 # gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-metadata-filter \
 # gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-enhance-k8s-metadata \
 # gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-sumologic \
 
-gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :ref => '6b40464cd71e2789ea6de94f618f793a8db9ac49'
+gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :tag => 'v4.11.0'
 # master branch
 # gem specific_install https://github.com/abonas/kubeclient --ref 6b40464cd71e2789ea6de94f618f793a8db9ac49 \
\ No newline at end of file

From e99cb13630cce52b9d7f2ab9d2e0e8273890d729 Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 18:22:36 +0200
Subject: [PATCH 09/18] format gemfile

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.16-staging/Gemfile | 110 +++++++++++++++++++++---------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/v1.16-staging/Gemfile b/v1.16-staging/Gemfile
index f7bdce4..bd59ed0 100644
--- a/v1.16-staging/Gemfile
+++ b/v1.16-staging/Gemfile
@@ -1,61 +1,61 @@
 source 'https://rubygems.org'
 
-gem "oj", "3.14.2"
-gem "activesupport", "6.1.7"
-gem "http_parser.rb", "0.8.0"
-gem "tzinfo", "1.2.11"
-gem "resolv", "0.2.2"
-gem "json", "2.6.3"
-gem "yajl-ruby", "1.4.1"
-gem "async", "1.31.0"
-gem "async-http", "0.60.1"
+gem 'oj', '3.14.2'
+gem 'activesupport', '6.1.7'
+gem 'http_parser.rb', '0.8.0'
+gem 'tzinfo', '1.2.11'
+gem 'resolv', '0.2.2'
+gem 'json', '2.6.3'
+gem 'yajl-ruby', '1.4.1'
+gem 'async', '1.31.0'
+gem 'async-http', '0.60.1'
 gem 'fluentd', '1.16.2'
-gem "prometheus-client", "4.1.0"
-gem "bigdecimal", "3.1.4"
-gem "webrick", "1.8.1"
-gem "gelf", "3.1.0"
-gem "elasticsearch", "8.6.0"
-gem "elasticsearch-xpack", "7.17.7"
-gem "snappy", "0.2.0"
-gem "fluent-plugin-detect-exceptions", "0.0.15"
-# gem "specific_install", "0.3.8"
-gem "fluent-plugin-remote-syslog", "1.1.0"
-gem "fluent-plugin-webhdfs", "1.5.0"
-gem "fluent-plugin-prometheus", "2.0.3"
-gem "fluent-plugin-s3", "1.7.2"
-gem "fluent-plugin-rewrite-tag-filter", "2.4.0"
-gem "fluent-plugin-azure-storage-append-blob", "0.2.1"
-gem "fluent-plugin-aliyun-oss", "0.0.1"
-gem "fluent-plugin-dedot_filter", "1.0.0"
-gem "fluent-plugin-sumologic_output", "1.8.0"
-gem "fluent-plugin-kafka", "0.18.1"
-gem "fluent-plugin-geoip", "1.3.2"
-gem "fluent-plugin-tag-normaliser", "0.1.2"
-gem "fluent-plugin-grafana-loki", "1.2.20"
-gem "fluent-plugin-concat", "2.5.0"
-gem "fluent-plugin-kinesis", "3.4.2"
-gem "fluent-plugin-parser-logfmt", "0.0.0"
-gem "fluent-plugin-multi-format-parser", "1.0.0"
-gem "fluent-plugin-record-modifier", "2.1.1"
-gem "fluent-plugin-splunk-hec", "1.3.2"
-gem "fluent-plugin-elasticsearch", "5.3.0"
-gem "fluent-plugin-newrelic", "1.2.2"
-gem "fluent-plugin-cloudwatch-logs", "0.14.3"
-gem "fluent-plugin-opensearch", "1.1.2"
-gem "fluent-plugin-aws-elasticsearch-service", "2.4.1"
-gem "fluent-plugin-kube-events-timestamp", "0.1.3"
-gem "fluent-plugin-grok-parser", "2.6.2"
-gem "fluent-plugin-throttle", "0.0.5"
-gem "fluent-plugin-logdna", "0.4.0"
-gem "fluent-plugin-datadog", "0.14.2"
-gem "fluent-plugin-redis", "0.3.5"
-gem "fluent-plugin-gelf-hs", "1.0.8"
-gem "fluent-plugin-sqs", "3.0.0"
-gem "fluent-plugin-mattermost", "0.2.2"
-gem "fluent-plugin-vmware-loginsight", "1.4.0"
-gem "fluent-plugin-vmware-log-intelligence", "2.0.6"
-gem "fluent-plugin-mysqlslowquery", "0.0.9"
-gem "fluent-plugin-logzio", "0.0.22"
+gem 'prometheus-client', '4.1.0'
+gem 'bigdecimal', '3.1.4'
+gem 'webrick', '1.8.1'
+gem 'gelf', '3.1.0'
+gem 'elasticsearch', '8.6.0'
+gem 'elasticsearch-xpack', '7.17.7'
+gem 'snappy', '0.2.0'
+gem 'fluent-plugin-detect-exceptions', '0.0.15'
+# gem 'specific_install', '0.3.8'
+gem 'fluent-plugin-remote-syslog', '1.1.0'
+gem 'fluent-plugin-webhdfs', '1.5.0'
+gem 'fluent-plugin-prometheus', '2.0.3'
+gem 'fluent-plugin-s3', '1.7.2'
+gem 'fluent-plugin-rewrite-tag-filter', '2.4.0'
+gem 'fluent-plugin-azure-storage-append-blob', '0.2.1'
+gem 'fluent-plugin-aliyun-oss', '0.0.1'
+gem 'fluent-plugin-dedot_filter', '1.0.0'
+gem 'fluent-plugin-sumologic_output', '1.8.0'
+gem 'fluent-plugin-kafka', '0.18.1'
+gem 'fluent-plugin-geoip', '1.3.2'
+gem 'fluent-plugin-tag-normaliser', '0.1.2'
+gem 'fluent-plugin-grafana-loki', '1.2.20'
+gem 'fluent-plugin-concat', '2.5.0'
+gem 'fluent-plugin-kinesis', '3.4.2'
+gem 'fluent-plugin-parser-logfmt', '0.0.0'
+gem 'fluent-plugin-multi-format-parser', '1.0.0'
+gem 'fluent-plugin-record-modifier', '2.1.1'
+gem 'fluent-plugin-splunk-hec', '1.3.2'
+gem 'fluent-plugin-elasticsearch', '5.3.0'
+gem 'fluent-plugin-newrelic', '1.2.2'
+gem 'fluent-plugin-cloudwatch-logs', '0.14.3'
+gem 'fluent-plugin-opensearch', '1.1.2'
+gem 'fluent-plugin-aws-elasticsearch-service', '2.4.1'
+gem 'fluent-plugin-kube-events-timestamp', '0.1.3'
+gem 'fluent-plugin-grok-parser', '2.6.2'
+gem 'fluent-plugin-throttle', '0.0.5'
+gem 'fluent-plugin-logdna', '~> 0.4.0'
+gem 'fluent-plugin-datadog', '0.14.2'
+gem 'fluent-plugin-redis', '0.3.5'
+gem 'fluent-plugin-gelf-hs', '1.0.8'
+gem 'fluent-plugin-sqs', '3.0.0'
+gem 'fluent-plugin-mattermost', '0.2.2'
+gem 'fluent-plugin-vmware-loginsight', '1.4.0'
+gem 'fluent-plugin-vmware-log-intelligence', '2.0.6'
+gem 'fluent-plugin-mysqlslowquery', '0.0.9'
+gem 'fluent-plugin-logzio', '0.0.22'
 gem 'fluent-plugin-syslog_rfc5424', :git => 'https://github.com/acquia/fluent-plugin-syslog_rfc5424.git', :tag => '0.2.1'
 # main branch
 # gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \

From 11e93e1f7f690a248df2feaa06e7170edb4dd3d1 Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 18:24:24 +0200
Subject: [PATCH 10/18] remove gemfile from v1.15-ruby directrory

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.15-ruby3/Gemfile | 78 ---------------------------------------------
 1 file changed, 78 deletions(-)
 delete mode 100644 v1.15-ruby3/Gemfile

diff --git a/v1.15-ruby3/Gemfile b/v1.15-ruby3/Gemfile
deleted file mode 100644
index ee12dc9..0000000
--- a/v1.15-ruby3/Gemfile
+++ /dev/null
@@ -1,78 +0,0 @@
-source 'https://rubygems.org'
-
-gem "oj", "3.14.2"
-gem "activesupport", "6.1.7"
-gem "http_parser.rb", "0.8.0"
-gem "tzinfo", "1.2.11"
-gem "resolv", "0.2.2"
-gem "json", "2.6.3"
-gem "yajl-ruby", "1.4.1"
-gem "async", "1.31.0"
-gem "async-http", "0.60.1"
-gem "fluentd", "1.15.3"
-gem "prometheus-client", "4.1.0"
-gem "bigdecimal", "3.1.4"
-gem "webrick", "1.8.1"
-gem "gelf", "3.1.0"
-gem "elasticsearch", "8.6.0"
-gem "elasticsearch-xpack", "7.17.7"
-gem "snappy", "0.2.0"
-gem "fluent-plugin-detect-exceptions", "0.0.15"
-# gem "specific_install", "0.3.8"
-gem "fluent-plugin-remote-syslog", "1.1.0"
-gem "fluent-plugin-webhdfs", "1.5.0"
-gem "fluent-plugin-prometheus", "2.0.3"
-gem "fluent-plugin-s3", "1.7.2"
-gem "fluent-plugin-rewrite-tag-filter", "2.4.0"
-gem "fluent-plugin-azure-storage-append-blob", "0.2.1"
-gem "fluent-plugin-aliyun-oss", "0.0.1"
-gem "fluent-plugin-dedot_filter", "1.0.0"
-gem "fluent-plugin-sumologic_output", "1.8.0"
-gem "fluent-plugin-kafka", "0.18.1"
-gem "fluent-plugin-geoip", "1.3.2"
-gem "fluent-plugin-tag-normaliser", "0.1.2"
-gem "fluent-plugin-grafana-loki", "1.2.20"
-gem "fluent-plugin-concat", "2.5.0"
-gem "fluent-plugin-kinesis", "3.4.2"
-gem "fluent-plugin-parser-logfmt", "0.0.0"
-gem "fluent-plugin-multi-format-parser", "1.0.0"
-gem "fluent-plugin-record-modifier", "2.1.1"
-gem "fluent-plugin-splunk-hec", "1.3.2"
-gem "fluent-plugin-elasticsearch", "5.3.0"
-gem "fluent-plugin-newrelic", "1.2.2"
-gem "fluent-plugin-cloudwatch-logs", "0.14.3"
-gem "fluent-plugin-opensearch", "1.1.2"
-gem "fluent-plugin-aws-elasticsearch-service", "2.4.1"
-gem "fluent-plugin-kube-events-timestamp", "0.1.3"
-gem "fluent-plugin-grok-parser", "2.6.2"
-gem "fluent-plugin-throttle", "0.0.5"
-gem "fluent-plugin-logdna", "0.4.0"
-gem "fluent-plugin-datadog", "0.14.2"
-gem "fluent-plugin-redis", "0.3.5"
-gem "fluent-plugin-gelf-hs", "1.0.8"
-gem "fluent-plugin-sqs", "3.0.0"
-gem "fluent-plugin-mattermost", "0.2.2"
-gem "fluent-plugin-vmware-loginsight", "1.4.0"
-gem "fluent-plugin-vmware-log-intelligence", "2.0.6"
-gem "fluent-plugin-mysqlslowquery", "0.0.9"
-gem "fluent-plugin-logzio", "0.0.22"
-gem 'fluent-plugin-syslog_rfc5424', :git => 'https://github.com/acquia/fluent-plugin-syslog_rfc5424.git', :ref => '5199be67d1a385f529fa1d6b6023e95ba7fac27d'
-# main branch
-# gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \
-gem 'fluent-plugin-gcs', :git => 'https://github.com/banzaicloud/fluent-plugin-gcs.git', :ref => '9fbff74734ddce289f9a10734a338b3c7f0065b5'
-# master branch
-# gem specific_install -l https://github.com/banzaicloud/fluent-plugin-gcs.git --ref 9fbff74734ddce289f9a10734a338b3c7f0065b5 \
-gem 'fluent-plugin-label-router', :git => 'https://github.com/kube-logging/fluent-plugin-label-router.git', :ref => '2ff43789f895735b7852e0a1a809280e22d9e8ef'
-# rwlock branch
-# gem specific_install -l https://github.com/kube-logging/fluent-plugin-label-router.git --ref 2ff43789f895735b7852e0a1a809280e22d9e8ef \
-gem 'fluent-plugin-kubernetes-metadata-filter', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :ref => '3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6', :glob => 'fluent-plugin-kubernetes-metadata-filter/*.gemspec'
-gem 'fluent-plugin-enhance-k8s-metadata', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :ref => '3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6', :glob => 'fluent-plugin-enhance-k8s-metadata/*.gemspec'
-gem 'fluent-plugin-kubernetes-sumologic', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :ref => '3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6', :glob => 'fluent-plugin-kubernetes-sumologic/*.gemspec'
-# main branch
-# gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-metadata-filter \
-# gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-enhance-k8s-metadata \
-# gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-sumologic \
-
-gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :ref => '6b40464cd71e2789ea6de94f618f793a8db9ac49'
-# master branch
-# gem specific_install https://github.com/abonas/kubeclient --ref 6b40464cd71e2789ea6de94f618f793a8db9ac49 \
\ No newline at end of file

From 33e252f82e6ed637ed32b76d73ed9528e060ef2d Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 18:31:26 +0200
Subject: [PATCH 11/18] downgrade gem kubeclient to v3.1.2 to solve
 incompatibility issues

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.16-staging/Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v1.16-staging/Gemfile b/v1.16-staging/Gemfile
index bd59ed0..05362da 100644
--- a/v1.16-staging/Gemfile
+++ b/v1.16-staging/Gemfile
@@ -73,6 +73,6 @@ gem 'fluent-plugin-kubernetes-sumologic', :git => 'https://github.com/SumoLogic/
 # gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-enhance-k8s-metadata \
 # gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-sumologic \
 
-gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :tag => 'v4.11.0'
+gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :tag => 'v3.1.2'
 # master branch
 # gem specific_install https://github.com/abonas/kubeclient --ref 6b40464cd71e2789ea6de94f618f793a8db9ac49 \
\ No newline at end of file

From f44505168f5268d381182ad806293a20f12907c9 Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 22:18:42 +0200
Subject: [PATCH 12/18] rename docher image dir to v1.16

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 {v1.16-staging => v1.16}/Dockerfile    | 0
 {v1.16-staging => v1.16}/Gemfile       | 1 -
 {v1.16-staging => v1.16}/entrypoint.sh | 0
 {v1.16-staging => v1.16}/fluent.conf   | 0
 {v1.16-staging => v1.16}/healthy.sh    | 0
 5 files changed, 1 deletion(-)
 rename {v1.16-staging => v1.16}/Dockerfile (100%)
 rename {v1.16-staging => v1.16}/Gemfile (95%)
 rename {v1.16-staging => v1.16}/entrypoint.sh (100%)
 rename {v1.16-staging => v1.16}/fluent.conf (100%)
 rename {v1.16-staging => v1.16}/healthy.sh (100%)

diff --git a/v1.16-staging/Dockerfile b/v1.16/Dockerfile
similarity index 100%
rename from v1.16-staging/Dockerfile
rename to v1.16/Dockerfile
diff --git a/v1.16-staging/Gemfile b/v1.16/Gemfile
similarity index 95%
rename from v1.16-staging/Gemfile
rename to v1.16/Gemfile
index 05362da..debb771 100644
--- a/v1.16-staging/Gemfile
+++ b/v1.16/Gemfile
@@ -59,7 +59,6 @@ gem 'fluent-plugin-logzio', '0.0.22'
 gem 'fluent-plugin-syslog_rfc5424', :git => 'https://github.com/acquia/fluent-plugin-syslog_rfc5424.git', :tag => '0.2.1'
 # main branch
 # gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \
-gem 'fluent-plugin-gcs', :git => 'https://github.com/banzaicloud/fluent-plugin-gcs.git', :ref => '9fbff74734ddce289f9a10734a338b3c7f0065b5'
 # master branch
 # gem specific_install -l https://github.com/banzaicloud/fluent-plugin-gcs.git --ref 9fbff74734ddce289f9a10734a338b3c7f0065b5 \
 gem 'fluent-plugin-label-router', :git => 'https://github.com/kube-logging/fluent-plugin-label-router.git', :ref => '2ff43789f895735b7852e0a1a809280e22d9e8ef'
diff --git a/v1.16-staging/entrypoint.sh b/v1.16/entrypoint.sh
similarity index 100%
rename from v1.16-staging/entrypoint.sh
rename to v1.16/entrypoint.sh
diff --git a/v1.16-staging/fluent.conf b/v1.16/fluent.conf
similarity index 100%
rename from v1.16-staging/fluent.conf
rename to v1.16/fluent.conf
diff --git a/v1.16-staging/healthy.sh b/v1.16/healthy.sh
similarity index 100%
rename from v1.16-staging/healthy.sh
rename to v1.16/healthy.sh

From 217d7d76dad32a907f71e423191c5835a4b9353b Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 22:19:26 +0200
Subject: [PATCH 13/18] pin gem fluent-plugin-gcs to tag instead of ref

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.16/Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/v1.16/Gemfile b/v1.16/Gemfile
index debb771..5fd6f32 100644
--- a/v1.16/Gemfile
+++ b/v1.16/Gemfile
@@ -59,6 +59,7 @@ gem 'fluent-plugin-logzio', '0.0.22'
 gem 'fluent-plugin-syslog_rfc5424', :git => 'https://github.com/acquia/fluent-plugin-syslog_rfc5424.git', :tag => '0.2.1'
 # main branch
 # gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \
+gem 'fluent-plugin-gcs', :git => 'https://github.com/kube-logging/fluent-plugin-gcs.git', :tag => 'v0.3.0'
 # master branch
 # gem specific_install -l https://github.com/banzaicloud/fluent-plugin-gcs.git --ref 9fbff74734ddce289f9a10734a338b3c7f0065b5 \
 gem 'fluent-plugin-label-router', :git => 'https://github.com/kube-logging/fluent-plugin-label-router.git', :ref => '2ff43789f895735b7852e0a1a809280e22d9e8ef'

From 3816540b6d91e748c55cd6a9d70123d587f664ea Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 22:26:23 +0200
Subject: [PATCH 14/18] remove unused linesc in Gemfile

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.16/Gemfile | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/v1.16/Gemfile b/v1.16/Gemfile
index 5fd6f32..97a0d75 100644
--- a/v1.16/Gemfile
+++ b/v1.16/Gemfile
@@ -18,7 +18,6 @@ gem 'elasticsearch', '8.6.0'
 gem 'elasticsearch-xpack', '7.17.7'
 gem 'snappy', '0.2.0'
 gem 'fluent-plugin-detect-exceptions', '0.0.15'
-# gem 'specific_install', '0.3.8'
 gem 'fluent-plugin-remote-syslog', '1.1.0'
 gem 'fluent-plugin-webhdfs', '1.5.0'
 gem 'fluent-plugin-prometheus', '2.0.3'
@@ -57,22 +56,9 @@ gem 'fluent-plugin-vmware-log-intelligence', '2.0.6'
 gem 'fluent-plugin-mysqlslowquery', '0.0.9'
 gem 'fluent-plugin-logzio', '0.0.22'
 gem 'fluent-plugin-syslog_rfc5424', :git => 'https://github.com/acquia/fluent-plugin-syslog_rfc5424.git', :tag => '0.2.1'
-# main branch
-# gem specific_install -l https://github.com/acquia/fluent-plugin-syslog_rfc5424.git --ref 5199be67d1a385f529fa1d6b6023e95ba7fac27d \
 gem 'fluent-plugin-gcs', :git => 'https://github.com/kube-logging/fluent-plugin-gcs.git', :tag => 'v0.3.0'
-# master branch
-# gem specific_install -l https://github.com/banzaicloud/fluent-plugin-gcs.git --ref 9fbff74734ddce289f9a10734a338b3c7f0065b5 \
 gem 'fluent-plugin-label-router', :git => 'https://github.com/kube-logging/fluent-plugin-label-router.git', :ref => '2ff43789f895735b7852e0a1a809280e22d9e8ef'
-# rwlock branch
-# gem specific_install -l https://github.com/kube-logging/fluent-plugin-label-router.git --ref 2ff43789f895735b7852e0a1a809280e22d9e8ef \
 gem 'fluent-plugin-kubernetes-metadata-filter', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-kubernetes-metadata-filter/*.gemspec'
 gem 'fluent-plugin-enhance-k8s-metadata', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-enhance-k8s-metadata/*.gemspec'
 gem 'fluent-plugin-kubernetes-sumologic', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-kubernetes-sumologic/*.gemspec'
-# main branch
-# gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-metadata-filter \
-# gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-enhance-k8s-metadata \
-# gem specific_install -l https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git --ref 3a5a2e29e3776107a1bf0c9435de5cc2b14fc7f6 -d fluent-plugin-kubernetes-sumologic \
-
-gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :tag => 'v3.1.2'
-# master branch
-# gem specific_install https://github.com/abonas/kubeclient --ref 6b40464cd71e2789ea6de94f618f793a8db9ac49 \
\ No newline at end of file
+gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :tag => 'v3.1.2'
\ No newline at end of file

From 6fc0cbe810ac21a0365a179e839a4ade5e2566ca Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Wed, 4 Oct 2023 23:24:10 +0200
Subject: [PATCH 15/18] pin dependency fluent-plugin-gcs to master branch to
 solve incompatibility with fluentd 1.16

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.16/Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v1.16/Gemfile b/v1.16/Gemfile
index 97a0d75..17d5633 100644
--- a/v1.16/Gemfile
+++ b/v1.16/Gemfile
@@ -56,7 +56,7 @@ gem 'fluent-plugin-vmware-log-intelligence', '2.0.6'
 gem 'fluent-plugin-mysqlslowquery', '0.0.9'
 gem 'fluent-plugin-logzio', '0.0.22'
 gem 'fluent-plugin-syslog_rfc5424', :git => 'https://github.com/acquia/fluent-plugin-syslog_rfc5424.git', :tag => '0.2.1'
-gem 'fluent-plugin-gcs', :git => 'https://github.com/kube-logging/fluent-plugin-gcs.git', :tag => 'v0.3.0'
+gem 'fluent-plugin-gcs', :git => 'https://github.com/kube-logging/fluent-plugin-gcs.git', :branch => 'master'
 gem 'fluent-plugin-label-router', :git => 'https://github.com/kube-logging/fluent-plugin-label-router.git', :ref => '2ff43789f895735b7852e0a1a809280e22d9e8ef'
 gem 'fluent-plugin-kubernetes-metadata-filter', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-kubernetes-metadata-filter/*.gemspec'
 gem 'fluent-plugin-enhance-k8s-metadata', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-enhance-k8s-metadata/*.gemspec'

From d6e812297b5cc92b3b02d8bfdd6c9d233bff2a6d Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Thu, 5 Oct 2023 01:14:48 +0200
Subject: [PATCH 16/18] deactivate conflicting gems

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.16/Gemfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/v1.16/Gemfile b/v1.16/Gemfile
index 17d5633..59dc938 100644
--- a/v1.16/Gemfile
+++ b/v1.16/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'oj', '3.14.2'
 gem 'activesupport', '6.1.7'
 gem 'http_parser.rb', '0.8.0'
-gem 'tzinfo', '1.2.11'
+gem 'tzinfo', '>= 1.2.11'
 gem 'resolv', '0.2.2'
 gem 'json', '2.6.3'
 gem 'yajl-ruby', '1.4.1'
@@ -23,7 +23,7 @@ gem 'fluent-plugin-webhdfs', '1.5.0'
 gem 'fluent-plugin-prometheus', '2.0.3'
 gem 'fluent-plugin-s3', '1.7.2'
 gem 'fluent-plugin-rewrite-tag-filter', '2.4.0'
-gem 'fluent-plugin-azure-storage-append-blob', '0.2.1'
+# gem 'fluent-plugin-azure-storage-append-blob', '0.2.1'
 gem 'fluent-plugin-aliyun-oss', '0.0.1'
 gem 'fluent-plugin-dedot_filter', '1.0.0'
 gem 'fluent-plugin-sumologic_output', '1.8.0'
@@ -41,11 +41,11 @@ gem 'fluent-plugin-elasticsearch', '5.3.0'
 gem 'fluent-plugin-newrelic', '1.2.2'
 gem 'fluent-plugin-cloudwatch-logs', '0.14.3'
 gem 'fluent-plugin-opensearch', '1.1.2'
-gem 'fluent-plugin-aws-elasticsearch-service', '2.4.1'
+# gem 'fluent-plugin-aws-elasticsearch-service', '2.4.1'
 gem 'fluent-plugin-kube-events-timestamp', '0.1.3'
 gem 'fluent-plugin-grok-parser', '2.6.2'
 gem 'fluent-plugin-throttle', '0.0.5'
-gem 'fluent-plugin-logdna', '~> 0.4.0'
+# gem 'fluent-plugin-logdna', '~> 0.4.0'
 gem 'fluent-plugin-datadog', '0.14.2'
 gem 'fluent-plugin-redis', '0.3.5'
 gem 'fluent-plugin-gelf-hs', '1.0.8'
@@ -61,4 +61,4 @@ gem 'fluent-plugin-label-router', :git => 'https://github.com/kube-logging/fluen
 gem 'fluent-plugin-kubernetes-metadata-filter', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-kubernetes-metadata-filter/*.gemspec'
 gem 'fluent-plugin-enhance-k8s-metadata', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-enhance-k8s-metadata/*.gemspec'
 gem 'fluent-plugin-kubernetes-sumologic', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-kubernetes-sumologic/*.gemspec'
-gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :tag => 'v3.1.2'
\ No newline at end of file
+# gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :tag => 'v3.1.2'
\ No newline at end of file

From afe9748a28e58645fb73a13a801ee3f943e4944d Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Thu, 5 Oct 2023 21:38:04 +0200
Subject: [PATCH 17/18] most recent version of kubeclient is compatible

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 v1.16/Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v1.16/Gemfile b/v1.16/Gemfile
index 59dc938..94c06fe 100644
--- a/v1.16/Gemfile
+++ b/v1.16/Gemfile
@@ -61,4 +61,4 @@ gem 'fluent-plugin-label-router', :git => 'https://github.com/kube-logging/fluen
 gem 'fluent-plugin-kubernetes-metadata-filter', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-kubernetes-metadata-filter/*.gemspec'
 gem 'fluent-plugin-enhance-k8s-metadata', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-enhance-k8s-metadata/*.gemspec'
 gem 'fluent-plugin-kubernetes-sumologic', :git => 'https://github.com/SumoLogic/sumologic-kubernetes-fluentd.git', :tag => 'v1.16.2-sumo-0', :glob => 'fluent-plugin-kubernetes-sumologic/*.gemspec'
-# gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :tag => 'v3.1.2'
\ No newline at end of file
+gem 'kubeclient', :git => 'https://github.com/abonas/kubeclient.git', :tag => 'v4.11.0'
\ No newline at end of file

From 3a7b9dcb7159a01c3a10cbd3006adb15a55762a3 Mon Sep 17 00:00:00 2001
From: David Kilias <david.kilias@gmail.com>
Date: Thu, 5 Oct 2023 21:41:06 +0200
Subject: [PATCH 18/18] add image v1.16 to ci build job

Signed-off-by: David Kilias <david.kilias@gmail.com>
---
 .github/workflows/ci.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a3c8b53..8cef819 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -13,6 +13,7 @@ jobs:
         fluentd:
           - v1.15-staging
           - v1.15-ruby3
+          - v1.16
 
     steps:
       - name: Checkout