1.1.7

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-metrics (1.1.6)
+    fluent-plugin-kubernetes-metrics (1.1.7)
       fluentd (>= 1.9.1)
       kubeclient (~> 4.6.0)
       multi_json (~> 1.14.1)
@@ -19,18 +19,18 @@ GEM
     docile (1.4.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.15.3)
+    ffi (1.15.4)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.13.2)
+    fluentd (1.14.2)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.8.0)
       msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.2.2, < 3.0.0)
       sigdump (~> 0.2.2)
-      strptime (>= 0.2.2, < 1.0.0)
+      strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
       webrick (>= 1.4.2, < 1.8.0)
@@ -48,19 +48,19 @@ GEM
     http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.7.0)
-    json (2.5.1)
+    json (2.6.1)
     kubeclient (4.6.0)
       http (>= 3.0, < 5.0)
       recursive-open-struct (~> 1.0, >= 1.0.4)
       rest-client (~> 2.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
+    mime-types-data (3.2021.0901)
     msgpack (1.4.2)
     multi_json (1.14.1)
     netrc (0.11.0)
     oj (3.10.18)
-    power_assert (2.0.0)
+    power_assert (2.0.1)
     public_suffix (4.0.6)
     rake (13.0.6)
     recursive-open-struct (1.1.3)
@@ -83,11 +83,11 @@ GEM
       power_assert
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.1)
+    tzinfo-data (1.2021.5)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)

Makefile

@@ -12,11 +12,9 @@ clean: clean_pkg clean_gems
 build: clean_pkg 
 	@bundle exec rake build
 
-docker: build install-deps
-	@cp pkg/fluent-plugin-*.gem docker
-	@mkdir -p docker/licenses
-	@cp -rp LICENSE docker/licenses/
-	@docker build --no-cache --pull --build-arg VERSION=$(VERSION) -t splunk/k8s-metrics:$(VERSION) ./docker
+.PHONY: docker
+docker: 
+	@docker build --no-cache --pull --build-arg VERSION=$(VERSION) -t splunk/k8s-metrics:$(VERSION) . -f docker/Dockerfile
 
 unit-test:
 	@bundle exec rake test

VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

docker/Gemfile

@@ -3,10 +3,10 @@ source 'https://rubygems.org'
 # This is separate gemfile for building docker image that has all plugins 
 # for kubernetes log collection agent
 # List all required gems here and install via bundler to resolve dependencies
-gem "fluentd", "=1.11.5"
+gem "fluentd", ">=1.14.2"
 gem "fluent-plugin-prometheus", ">=2.0"
 gem "fluent-plugin-record-modifier", "=2.1.0"
-gem "fluent-plugin-kubernetes_metadata_filter", "=2.5.3"
+gem "fluent-plugin-kubernetes_metadata_filter", ">=2.5.3"
 gem "fluent-plugin-jq", "=0.5.1"
 gem "oj", "=3.10.18"
 gem 'multi_json', '=1.14.1'

docker/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: gem
   specs:
-    fluent-plugin-kubernetes-metrics (1.1.6)
+    fluent-plugin-kubernetes-metrics (1.1.7)
       fluentd (>= 1.9.1)
       kubeclient (~> 4.6.0)
       multi_json (~> 1.14.1)
@@ -10,9 +10,9 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4)
-      activesupport (= 6.1.4)
-    activesupport (6.1.4)
+    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)
@@ -29,18 +29,18 @@ GEM
     cool.io (1.7.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.15.3)
+    ffi (1.15.4)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
     fluent-plugin-jq (0.5.1)
       fluentd (>= 0.14.10, < 2)
       multi_json (~> 1.13)
-    fluent-plugin-kubernetes_metadata_filter (2.5.3)
-      fluentd (>= 0.14.0, < 1.12)
-      kubeclient (< 5)
+    fluent-plugin-kubernetes_metadata_filter (2.9.2)
+      fluentd (>= 0.14.0, < 1.15)
+      kubeclient (>= 4.0.0, < 5.0.0)
       lru_redux
-    fluent-plugin-prometheus (2.0.1)
+    fluent-plugin-prometheus (2.0.2)
       fluentd (>= 1.9.1, < 2)
       prometheus-client (>= 2.1.0)
     fluent-plugin-record-modifier (2.1.0)
@@ -51,15 +51,17 @@ GEM
       net-http-persistent (~> 3.1)
       openid_connect (~> 1.1.8)
       prometheus-client (>= 2.1.0)
-    fluentd (1.11.5)
+    fluentd (1.14.2)
+      bundler
       cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
+      http_parser.rb (>= 0.5.1, < 0.8.0)
       msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.2.2, < 3.0.0)
       sigdump (~> 0.2.2)
-      strptime (>= 0.2.2, < 1.0.0)
+      strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
+      webrick (>= 1.4.2, < 1.8.0)
       yajl-ruby (~> 1.0)
     http (4.4.1)
       addressable (~> 2.3)
@@ -74,7 +76,7 @@ GEM
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.5.3)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     json-jwt (1.13.0)
       activesupport (>= 4.2)
@@ -89,8 +91,8 @@ GEM
       mini_mime (>= 0.1.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0704)
-    mini_mime (1.1.0)
+    mime-types-data (3.2021.0901)
+    mini_mime (1.1.2)
     minitest (5.14.4)
     msgpack (1.4.2)
     multi_json (1.14.1)
@@ -111,7 +113,7 @@ GEM
     prometheus-client (2.1.0)
     public_suffix (4.0.6)
     rack (2.2.3)
-    rack-oauth2 (1.17.0)
+    rack-oauth2 (1.19.0)
       activesupport
       attr_required
       httpclient
@@ -128,28 +130,29 @@ GEM
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     strptime (0.2.5)
-    swd (1.2.0)
+    swd (1.3.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.1)
+    tzinfo-data (1.2021.5)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8)
     validate_email (0.1.6)
       activemodel (>= 3.0)
       mail (>= 2.2.5)
     validate_url (1.0.13)
       activemodel (>= 3.0.0)
       public_suffix
-    webfinger (1.1.0)
+    webfinger (1.2.0)
       activesupport
       httpclient (>= 2.4)
+    webrick (1.7.0)
     yajl-ruby (1.4.1)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -158,11 +161,11 @@ DEPENDENCIES
   bigdecimal (= 3.0.0)
   fluent-plugin-jq (= 0.5.1)
   fluent-plugin-kubernetes-metrics!
-  fluent-plugin-kubernetes_metadata_filter (= 2.5.3)
+  fluent-plugin-kubernetes_metadata_filter (>= 2.5.3)
   fluent-plugin-prometheus (>= 2.0)
   fluent-plugin-record-modifier (= 2.1.0)
   fluent-plugin-splunk-hec (>= 1.2.5)
-  fluentd (= 1.11.5)
+  fluentd (>= 1.14.2)
   http_parser.rb (= 0.5.3)
   kubeclient (= 4.6.0)
   multi_json (= 1.14.1)