feat: improve monitoring for fluentd chart (#385)

Signed-off-by: jcriadomarco <jcriadomarco@vmware.com>

base-image/Dockerfile

@@ -3,7 +3,7 @@
 # Similar to https://github.com/drecom/docker-centos-ruby/blob/2.6.5-slim/Dockerfile
 
 ARG RVM_PATH=/usr/local/rvm
-ARG RUBY_VERSION=ruby-2.7.7
+ARG RUBY_VERSION=ruby-3.1.4
 ARG RUBY_PATH=/usr/local/rvm/rubies/$RUBY_VERSION
 ARG RUBYOPT='-W:no-deprecated -W:no-experimental'
 
@@ -58,16 +58,7 @@ RUN curl -sSL https://rvm.io/mpapis.asc | gpg --import \
     && rvm install --disable-binary $RUBY_VERSION --default \
     && gem update --system --no-document \
     && gem install bundler -v '>= 2.3.26' --default --no-document \
-    && bundler install \
-    && gem uninstall bundler \
-    && gem uninstall rake -v 13.0.6 \
-    && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/rexml-3.2.3.1.gemspec \
-    && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/rdoc-6.2.1.1.gemspec \
-    && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/json-2.3.0.gemspec \
-    && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/json-2.5.1.gemspec \
-    && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/webrick-1.6.1.gemspec \
-    && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/date-3.0.3.gemspec \
-    && rm -rf $RUBY_PATH/lib/ruby/gems/2.7.0/specifications/default/cgi-0.1.0.1.gemspec
+    && bundler install
 
 FROM photon:3.0
 ARG RUBY_PATH
@@ -123,7 +114,7 @@ RUN mkdir -p /fluentd/log /fluentd/etc /fluentd/plugins /usr/local/bundle/bin/ \
   && gem install fluent-plugin-detect-exceptions-*.gem \
   && rm -rf /fluentd/fluent-plugin-detect-exceptions \
   && cd /fluentd \
-  && git clone https://github.com/slimm609/fluent-plugin-google-cloud.git fluent-plugin-google-cloud \
+  && git clone https://github.com/javiercri/fluent-plugin-google-cloud.git fluent-plugin-google-cloud \
   && cd fluent-plugin-google-cloud \
   && gem build fluent-plugin-google-cloud.gemspec \
   && gem install fluent-plugin-google-cloud-*.gem \

base-image/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # pin fluentd, probably a good idea to pin all gems
-gem "fluentd", "1.15.3"
+gem "fluentd", "1.16.1"
 
 gem 'oj', '3.13.23'
 gem 'ffi'
@@ -13,12 +13,12 @@ gem 'fluent-plugin-datadog', "0.14.2"
 gem 'fluent-plugin-elasticsearch', "5.2.4"
 gem 'fluent-plugin-opensearch', "1.0.9"
 gem 'fluent-plugin-gelf-hs', "1.0.8"
-gem 'fluent-plugin-grafana-loki', "1.2.19"
+gem 'fluent-plugin-grafana-loki', "1.2.20"
 gem 'fluent-plugin-grok-parser', "2.6.2"
 gem 'fluent-plugin-json-in-json-2', "1.0.2"
 gem 'fluent-plugin-kafka', "0.18.1"
 gem 'fluent-plugin-kinesis', "3.4.2"
-gem 'fluent-plugin-kubernetes_metadata_filter', "2.13.0"
+gem 'fluent-plugin-kubernetes_metadata_filter', "3.2.0"
 gem 'fluent-plugin-kubernetes_sumologic', "2.4.2"
 gem 'fluent-plugin-kubernetes', "0.3.1"
 gem 'fluent-plugin-logentries', "0.2.10"
@@ -28,7 +28,7 @@ gem 'fluent-plugin-mongo', "1.5.0"
 gem 'fluent-plugin-multi-format-parser', "1.0.0"
 gem 'fluent-plugin-out-http', "1.3.3"
 gem 'fluent-plugin-papertrail', "0.2.8"
-gem 'fluent-plugin-prometheus', "2.0.2"
+gem 'fluent-plugin-prometheus', "2.0.3"
 gem 'fluent-plugin-record-modifier', "2.1.0"
 gem 'fluent-plugin-record-reformer', "0.9.1"
 gem 'fluent-plugin-redis', "0.3.5"

base-image/Gemfile.lock

@@ -128,7 +128,7 @@ GEM
     fluent-plugin-gelf-hs (1.0.8)
       fluentd
       gelf (>= 2.0.0)
-    fluent-plugin-grafana-loki (1.2.19)
+    fluent-plugin-grafana-loki (1.2.20)
       fluentd (>= 1.9.3, < 2)
     fluent-plugin-grok-parser (2.6.2)
       fluentd (>= 0.14.6, < 2)
@@ -147,8 +147,8 @@ GEM
     fluent-plugin-kubernetes (0.3.1)
       docker-api
       fluentd
-    fluent-plugin-kubernetes_metadata_filter (2.13.0)
-      fluentd (>= 0.14.0, < 1.16)
+    fluent-plugin-kubernetes_metadata_filter (3.2.0)
+      fluentd (>= 0.14.0, < 1.17)
       kubeclient (>= 4.0.0, < 5.0.0)
       lru_redux
     fluent-plugin-kubernetes_sumologic (2.4.2)
@@ -181,7 +181,7 @@ GEM
     fluent-plugin-papertrail (0.2.8)
       fluent-mixin-config-placeholders (~> 0.4.0)
       fluentd (>= 0.10, < 2)
-    fluent-plugin-prometheus (2.0.2)
+    fluent-plugin-prometheus (2.0.3)
       fluentd (>= 1.9.1, < 2)
       prometheus-client (>= 2.1.0)
     fluent-plugin-record-modifier (2.1.0)
@@ -239,23 +239,21 @@ GEM
     fluent-plugin-webhdfs (1.5.0)
       fluentd (>= 0.14.22)
       webhdfs (>= 0.10.0)
-    fluentd (1.15.3)
+    fluentd (1.16.1)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.9.0)
       msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.3.0, < 3.0.0)
+      serverengine (>= 2.3.2, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
-      webrick (>= 1.4.2, < 1.8.0)
+      webrick (~> 1.4)
       yajl-ruby (~> 1.0)
     gelf (3.1.0)
       json
     google-protobuf (3.21.9)
-    google-protobuf (3.21.9-x86_64-darwin)
-    google-protobuf (3.21.9-x86_64-linux)
     gssapi (1.3.1)
       ffi (>= 1.0.1)
     http (4.4.1)
@@ -299,7 +297,7 @@ GEM
     minitest (5.18.0)
     mongo (2.6.4)
       bson (>= 4.3.0, < 5.0.0)
-    msgpack (1.6.0)
+    msgpack (1.7.1)
     multi_json (1.15.0)
     multipart-post (2.2.3)
     myslog (0.1.1)
@@ -348,7 +346,7 @@ GEM
     ruby-kafka (1.5.0)
       digest-crc
     ruby2_keywords (0.0.5)
-    serverengine (2.3.0)
+    serverengine (2.3.2)
       sigdump (~> 0.2.2)
     set (1.0.3)
     sigdump (0.2.4)
@@ -365,7 +363,7 @@ GEM
       ffi (~> 1.9)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.7)
+    tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
@@ -384,7 +382,7 @@ GEM
       faraday_middleware (~> 1.1)
     webhdfs (0.10.2)
       addressable
-    webrick (1.7.0)
+    webrick (1.8.1)
     yajl-ruby (1.4.3)
 
 PLATFORMS
@@ -401,13 +399,13 @@ DEPENDENCIES
   fluent-plugin-datadog (= 0.14.2)
   fluent-plugin-elasticsearch (= 5.2.4)
   fluent-plugin-gelf-hs (= 1.0.8)
-  fluent-plugin-grafana-loki (= 1.2.19)
+  fluent-plugin-grafana-loki (= 1.2.20)
   fluent-plugin-grok-parser (= 2.6.2)
   fluent-plugin-json-in-json-2 (= 1.0.2)
   fluent-plugin-kafka (= 0.18.1)
   fluent-plugin-kinesis (= 3.4.2)
   fluent-plugin-kubernetes (= 0.3.1)
-  fluent-plugin-kubernetes_metadata_filter (= 2.13.0)
+  fluent-plugin-kubernetes_metadata_filter (= 3.2.0)
   fluent-plugin-kubernetes_sumologic (= 2.4.2)
   fluent-plugin-logentries (= 0.2.10)
   fluent-plugin-logzio (= 0.0.22)
@@ -418,7 +416,7 @@ DEPENDENCIES
   fluent-plugin-opensearch (= 1.0.9)
   fluent-plugin-out-http (= 1.3.3)
   fluent-plugin-papertrail (= 0.2.8)
-  fluent-plugin-prometheus (= 2.0.2)
+  fluent-plugin-prometheus (= 2.0.3)
   fluent-plugin-record-modifier (= 2.1.0)
   fluent-plugin-record-reformer (= 0.9.1)
   fluent-plugin-redis (= 0.3.5)
@@ -434,14 +432,14 @@ DEPENDENCIES
   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.3.1)
+  fluent-plugin-vmware-loginsight (= 1.4.1)
   fluent-plugin-webhdfs (= 1.5.0)
-  fluentd (= 1.15.3)
+  fluentd (= 1.16.1)
   gelf (= 3.1.0)
   gssapi (= 1.3.1)
   kubeclient (~> 4.9.3)
   logfmt (= 0.0.10)
   oj (= 3.13.23)
 
 BUNDLED WITH
-   2.1.4
+   2.4.13

base-image/basegems/Gemfile

@@ -5,7 +5,6 @@ gem 'async-http', '0.59.2'
 gem 'async-io', '1.34.0'
 gem 'async-pool', '0.3.12'
 gem 'date', '~> 3.2.2'
-gem 'ext_monitor', '0.1.2'
 gem 'json', '2.6.2'
 gem 'logger', '1.5.1'
 gem 'matrix', '0.4.2'

base-image/basegems/Gemfile.lock

@@ -22,7 +22,6 @@ GEM
       fiber-local
     date (3.2.2)
     e2mmap (0.1.0)
-    ext_monitor (0.1.2)
     fiber-local (1.0.0)
     forwardable (1.3.2)
     json (2.6.2)
@@ -74,7 +73,6 @@ DEPENDENCIES
   async-pool (= 0.3.12)
   cgi (= 0.3.6)
   date (~> 3.2.2)
-  ext_monitor (= 0.1.2)
   json (= 2.6.2)
   logger (= 1.5.1)
   matrix (= 0.4.2)