update json and hec (#55)

Author: rockb1017

Gemfile.lock

@@ -45,7 +45,7 @@ GEM
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.5.3)
-    json (2.1.0)
+    json (2.3.1)
     kubeclient (4.6.0)
       http (>= 3.0, < 5.0)
       recursive-open-struct (~> 1.0, >= 1.0.4)

Makefile

@@ -1,9 +1,15 @@
 VERSION := $(shell sh -c 'cat VERSION')
 
-clean: 
-	@rm -rf pkg/* docker/gem/ docker/gems/ docker/*.gem docker/licenses
+clean_pkg: 
+	@rm -rf pkg/* docker/*.gem 
 
-build: clean 
+clean_gems:
+	@rm -rf docker/gem/ docker/gems/
+
+clean: clean_pkg clean_gems
+	@rm -rf docker/licenses
+
+build: clean_pkg 
 	@bundle exec rake build
 
 docker: build install-deps
@@ -18,4 +24,9 @@ unit-test:
 install-deps:
 	@gem install bundler
 	@bundle update --bundler
-	@bundle install
+	@bundle install
+
+unpack: build
+	@cp pkg/fluent-plugin-*.gem docker
+	@gem unpack docker/fluent-plugin-*.gem --target docker/gem
+	@cd docker && bundle install

docker/Gemfile

@@ -14,6 +14,6 @@ gem 'bigdecimal', '=2.0.0'
 gem 'kubeclient', '=4.6.0'
 gem 'http_parser.rb', '=0.5.3'
 
-gem "fluent-plugin-splunk-hec", ">= 1.2.1"
+gem "fluent-plugin-splunk-hec", ">= 1.2.3"
 
 gem 'fluent-plugin-kubernetes-objects', path: 'gem/'

docker/Gemfile.lock

@@ -1,3 +1,11 @@
+PATH
+  remote: gem
+  specs:
+    fluent-plugin-kubernetes-objects (1.1.4)
+      fluentd (~> 1.9.1)
+      http_parser.rb (= 0.5.3)
+      kubeclient (~> 4.6.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -26,20 +34,13 @@ GEM
     fluent-plugin-jq (0.5.1)
       fluentd (>= 0.14.10, < 2)
       multi_json (~> 1.13)
-    fluent-plugin-kubernetes_metadata_filter (2.4.2)
-      fluentd (>= 0.14.0, < 2)
-      kubeclient (< 5)
-      lru_redux
     fluent-plugin-prometheus (1.7.0)
       fluentd (>= 0.14.20, < 2)
       prometheus-client (< 0.10)
     fluent-plugin-record-modifier (2.1.0)
       fluentd (>= 1.0, < 2)
-    fluent-plugin-splunk-hec (1.2.1)
-      activesupport (~> 5.2)
-      fluent-plugin-kubernetes_metadata_filter (~> 2.4.2)
+    fluent-plugin-splunk-hec (1.2.3)
       fluentd (>= 1.4)
-      http_parser.rb (= 0.5.3)
       multi_json (~> 1.13)
       net-http-persistent (~> 3.1)
       openid_connect (~> 1.1.8)
@@ -77,7 +78,6 @@ GEM
       http (>= 3.0, < 5.0)
       recursive-open-struct (~> 1.0, >= 1.0.4)
       rest-client (~> 2.0)
-    lru_redux (1.1.0)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     mime-types (3.3.1)
@@ -105,13 +105,13 @@ GEM
       quantile (~> 0.2.1)
     public_suffix (4.0.3)
     quantile (0.2.1)
-    rack (2.2.2)
-    rack-oauth2 (1.10.1)
+    rack (2.2.3)
+    rack-oauth2 (1.16.0)
       activesupport
       attr_required
       httpclient
       json-jwt (>= 1.11.0)
-      rack
+      rack (>= 2.1.0)
     rake (13.0.1)
     recursive-open-struct (1.1.0)
     rest-client (2.1.0)
@@ -152,9 +152,10 @@ PLATFORMS
 DEPENDENCIES
   bigdecimal (= 2.0.0)
   fluent-plugin-jq (= 0.5.1)
+  fluent-plugin-kubernetes-objects!
   fluent-plugin-prometheus (= 1.7.0)
   fluent-plugin-record-modifier (= 2.1.0)
-  fluent-plugin-splunk-hec (= 1.2.1)
+  fluent-plugin-splunk-hec (>= 1.2.3)
   fluentd (= 1.9.1)
   http_parser.rb (= 0.5.3)
   kubeclient (= 4.6.0)