1.2.7 (#178)

* Workaround false warning: parameter 'x' in <fields> is not used. (#168) record_transformer uses the `has_key()` method, not the `key()` method. Closes #161 * upgrade nodejs (#172) * Prometheus 2.1.0 upgrade (#171) * Prometheus-Client upgrade 0.10.0 -> 2.1.0 * GemLock update * - label fix * lib update (#177) * lib update * version Co-authored-by: Thomas Mueller <thomas@chaschperli.ch> Co-authored-by: Ferenc HERNADI <ferenc.hernadi@gmail.com>
splunk · Jul 20, 2021 · 6e087b6 · 6e087b6
1 parent 613fcf2
commit 6e087b6
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 80 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,51 +1,52 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-splunk-hec (1.2.5)
+    fluent-plugin-splunk-hec (1.2.7)
       fluentd (>= 1.4)
       multi_json (~> 1.13)
       net-http-persistent (~> 3.1)
       openid_connect (~> 1.1.8)
-      prometheus-client (< 0.10.0)
+      prometheus-client (>= 2.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3)
-      activesupport (= 6.1.3)
-    activesupport (6.1.3)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.1.0)
     ast (2.4.2)
     attr_required (1.0.1)
-    bindata (2.4.8)
-    concurrent-ruby (1.1.8)
-    connection_pool (2.2.3)
+    bindata (2.4.10)
+    concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
     cool.io (1.7.1)
     crack (0.4.5)
       rexml
-    docile (1.3.5)
-    fluentd (1.12.1)
+    docile (1.4.0)
+    fluentd (1.13.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)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
+      webrick (>= 1.4.2, < 1.8.0)
       yajl-ruby (~> 1.0)
     hashdiff (1.0.1)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.7.0)
     httpclient (2.8.3)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
     json-jwt (1.13.0)
@@ -54,7 +55,7 @@ GEM
       bindata
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mini_mime (1.0.2)
+    mini_mime (1.1.0)
     minitest (5.14.4)
     msgpack (1.4.2)
     multi_json (1.15.0)
@@ -71,24 +72,22 @@ GEM
       validate_url
       webfinger (>= 1.0.1)
     parallel (1.20.1)
-    parser (3.0.0.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     power_assert (2.0.0)
     powerpack (0.1.3)
-    prometheus-client (0.9.0)
-      quantile (~> 0.2.1)
+    prometheus-client (2.1.0)
     public_suffix (4.0.6)
-    quantile (0.2.1)
     rack (2.2.3)
-    rack-oauth2 (1.16.0)
+    rack-oauth2 (1.17.0)
       activesupport
       attr_required
       httpclient
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
     rainbow (3.0.0)
-    rake (13.0.3)
-    rexml (3.2.4)
+    rake (13.0.6)
+    rexml (3.2.5)
     rubocop (0.63.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -98,21 +97,21 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.4.0)
     ruby-progressbar (1.11.0)
-    serverengine (2.2.3)
+    serverengine (2.2.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     strptime (0.2.5)
     swd (1.2.0)
       activesupport (>= 3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
-    test-unit (3.4.0)
+    test-unit (3.4.4)
       power_assert
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -132,6 +131,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    webrick (1.7.0)
     yajl-ruby (1.4.1)
     zeitwerk (2.4.2)
 
@@ -149,4 +149,4 @@ DEPENDENCIES
   webmock (~> 3.5.0)
 
 BUNDLED WITH
-   2.2.12
+   2.2.23
diff --git a/Makefile b/Makefile
@@ -1,5 +1,4 @@
 VERSION := $(shell sh -c 'cat VERSION')
-NODEJS_VERSION := 14.15.1
 
 clean_pkg: 
 	@rm -rf pkg/* docker/*.gem 
@@ -17,7 +16,7 @@ docker: install-deps build
 	@cp pkg/fluent-plugin-*.gem docker
 	@mkdir -p docker/licenses
 	@cp -rp LICENSE docker/licenses/
-	@docker build --no-cache --pull --build-arg VERSION=$(VERSION) --build-arg NODEJS_VERSION=$(NODEJS_VERSION) -t splunk/fluentd-hec:$(VERSION) ./docker
+	@docker build --no-cache --pull --build-arg VERSION=$(VERSION) -t splunk/fluentd-hec:$(VERSION) ./docker
 
 unit-test:
 	@bundle exec rake test

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.5
+1.2.7
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,7 +1,6 @@
 FROM registry.access.redhat.com/ubi8/ruby-27
 
 ARG VERSION
-ARG NODEJS_VERSION
 
 LABEL name="Splunk Connect for Kubernetes Logging container" \
       maintainer="DataEdge@splunk.com" \
@@ -23,9 +22,7 @@ RUN dnf install -y jq
 
 COPY Gemfile* ./
 RUN yum update -y \
-   && npm install -g n \
-   && yum remove -y nodejs \
-   && n ${NODEJS_VERSION} \
+   && yum remove -y nodejs npm \
    && gem install bundler \
    && gem unpack /tmp/*.gem --target gem \
    && bundle install 

diff --git a/docker/Gemfile b/docker/Gemfile
@@ -6,14 +6,14 @@ source 'https://rubygems.org'
 gem "fluentd", "=1.11.5" 
 gem "fluent-plugin-systemd", "=1.0.2"
 gem "fluent-plugin-concat", "=2.4.0"
-gem "fluent-plugin-prometheus", "=1.8.5"
+gem "fluent-plugin-prometheus", "=2.0.1"
 gem "fluent-plugin-jq", "=0.5.1"
 gem "fluent-plugin-kubernetes_metadata_filter", "=2.5.3"
 gem "oj", "=3.11.2"
 gem 'multi_json', '~> 1.13'
 gem 'net-http-persistent', '~> 3.1'
 gem 'openid_connect', '~> 1.1.8'
-gem 'prometheus-client', '< 0.10.0'
+gem 'prometheus-client', '>= 2.1.0'
 gem 'activesupport', '~> 5.2.4.3'
 gem 'http_parser.rb', '=0.5.3'
 gem "rack", ">= 2.1.4"

diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock
@@ -6,29 +6,29 @@ PATH
       multi_json (~> 1.13)
       net-http-persistent (~> 3.1)
       openid_connect (~> 1.1.8)
-      prometheus-client (< 0.10.0)
+      prometheus-client (>= 2.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.5)
-      activesupport (= 5.2.4.5)
-    activesupport (5.2.4.5)
+    activemodel (5.2.4.6)
+      activesupport (= 5.2.4.6)
+    activesupport (5.2.4.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.1.0)
     attr_required (1.0.1)
-    bindata (2.4.8)
-    concurrent-ruby (1.1.8)
-    connection_pool (2.2.3)
+    bindata (2.4.10)
+    concurrent-ruby (1.1.9)
+    connection_pool (2.2.5)
     cool.io (1.7.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.14.2)
+    ffi (1.15.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -43,7 +43,7 @@ GEM
       lru_redux
     fluent-plugin-prometheus (1.8.5)
       fluentd (>= 1.9.1, < 2)
-      prometheus-client (< 0.10)
+      prometheus-client (>= 2.1.0)
     fluent-plugin-record-modifier (2.1.0)
       fluentd (>= 1.0, < 2)
     fluent-plugin-systemd (1.0.2)
@@ -65,22 +65,22 @@ GEM
       http-form_data (~> 2.2)
       http-parser (~> 1.2.0)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.4)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.5.3)
     httpclient (2.8.3)
-    i18n (1.8.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     json-jwt (1.13.0)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
     jsonpath (1.1.0)
       multi_json
-    kubeclient (4.9.1)
+    kubeclient (4.9.2)
       http (>= 3.0, < 5.0)
       jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
@@ -90,15 +90,15 @@ GEM
       mini_mime (>= 0.1.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    mini_mime (1.0.2)
+    mime-types-data (3.2021.0704)
+    mini_mime (1.1.0)
     minitest (5.14.4)
     msgpack (1.4.2)
     multi_json (1.15.0)
     net-http-persistent (3.1.0)
       connection_pool (~> 2.2)
     netrc (0.11.0)
-    oj (3.10.2)
+    oj (3.11.2)
     openid_connect (1.1.8)
       activemodel
       attr_required (>= 1.0.0)
@@ -109,25 +109,25 @@ GEM
       validate_email
       validate_url
       webfinger (>= 1.0.1)
-    prometheus-client (0.9.0)
+    prometheus-client (2.1.0)
       quantile (~> 0.2.1)
     public_suffix (4.0.6)
     quantile (0.2.1)
     rack (2.2.3)
-    rack-oauth2 (1.16.0)
+    rack-oauth2 (1.17.0)
       activesupport
       attr_required
       httpclient
       json-jwt (>= 1.11.0)
       rack (>= 2.1.0)
-    rake (13.0.3)
+    rake (13.0.6)
     recursive-open-struct (1.1.3)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    serverengine (2.2.3)
+    serverengine (2.2.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     strptime (0.2.5)
@@ -172,10 +172,10 @@ DEPENDENCIES
   http_parser.rb (= 0.5.3)
   multi_json (~> 1.13)
   net-http-persistent (~> 3.1)
-  oj (= 3.10.2)
+  oj (= 3.11.2)
   openid_connect (~> 1.1.8)
-  prometheus-client (< 0.10.0)
+  prometheus-client (>= 2.1.0)
   rack (>= 2.1.4)
 
 BUNDLED WITH
-   2.2.12
+   2.2.21
diff --git a/docker/build.sh b/docker/build.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 set -e
 TAG=$1
-NODEJS_VERSION=14.15.1
 
 # Install dependecies
 gem install bundler
@@ -17,4 +16,4 @@ VERSION=`cat VERSION`
 echo "Copying licenses to be included in the docker image..."
 mkdir -p docker/licenses
 cp -rp LICENSE docker/licenses/
-docker build --no-cache --pull --build-arg VERSION=$VERSION --build-arg NODEJS_VERSION=$NODEJS_VERSION -t splunk/fluentd-hec:$TAG ./docker
+docker build --no-cache --pull --build-arg VERSION=$VERSION -t splunk/fluentd-hec:$TAG ./docker
diff --git a/fluent-plugin-splunk-hec.gemspec b/fluent-plugin-splunk-hec.gemspec
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'multi_json', '~> 1.13'
   spec.add_runtime_dependency 'net-http-persistent', '~> 3.1'
   spec.add_runtime_dependency 'openid_connect', '~> 1.1.8'
-  spec.add_runtime_dependency 'prometheus-client', '< 0.10.0'
+  spec.add_runtime_dependency 'prometheus-client', '>= 2.1.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '>= 12.0'