diff --git a/Gemfile.lock b/Gemfile.lock index 3e9602a..b26684c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - fluent-plugin-kubernetes-metrics (1.1.5) + fluent-plugin-kubernetes-metrics (1.1.6) fluentd (>= 1.9.1) kubeclient (~> 4.6.0) multi_json (~> 1.14.1) @@ -10,29 +10,30 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.7.0) + addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - concurrent-ruby (1.1.8) + concurrent-ruby (1.1.9) cool.io (1.7.1) crack (0.4.5) rexml - docile (1.3.5) + docile (1.4.0) 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 - fluentd (1.12.1) + 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 (4.4.1) @@ -41,12 +42,12 @@ 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.6.0) + http_parser.rb (0.7.0) json (2.5.1) kubeclient (4.6.0) http (>= 3.0, < 5.0) @@ -54,22 +55,22 @@ GEM rest-client (~> 2.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0225) + mime-types-data (3.2021.0704) msgpack (1.4.2) multi_json (1.14.1) netrc (0.11.0) oj (3.10.18) power_assert (2.0.0) public_suffix (4.0.6) - 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) - rexml (3.2.4) - serverengine (2.2.3) + rexml (3.2.5) + serverengine (2.2.4) sigdump (~> 0.2.2) sigdump (0.2.4) simplecov (0.16.1) @@ -91,6 +92,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff + webrick (1.7.0) yajl-ruby (1.4.1) PLATFORMS diff --git a/Makefile b/Makefile index 97cf261..46a55e3 100644 --- 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: 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) --build-arg NODEJS_VERSION=$(NODEJS_VERSION) -t splunk/k8s-metrics:$(VERSION) ./docker + @docker build --no-cache --pull --build-arg VERSION=$(VERSION) -t splunk/k8s-metrics:$(VERSION) ./docker unit-test: @bundle exec rake test diff --git a/VERSION b/VERSION index 314c3d7..ab67981 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.1.5 \ No newline at end of file +1.1.6 \ No newline at end of file diff --git a/docker/Dockerfile b/docker/Dockerfile index cd43c76..8016370 100644 --- 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 Metrics container" \ maintainer="DataEdge@splunk.com" \ @@ -21,9 +20,7 @@ COPY licenses /licenses 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 index ad14bc0..ba730ee 100644 --- a/docker/Gemfile +++ b/docker/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' # for kubernetes log collection agent # List all required gems here and install via bundler to resolve dependencies gem "fluentd", "=1.11.5" -gem "fluent-plugin-prometheus", "=1.8.5" +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-jq", "=0.5.1" diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock index 93bcc0b..e41745c 100644 --- a/docker/Gemfile.lock +++ b/docker/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: gem specs: - fluent-plugin-kubernetes-metrics (1.1.5) + fluent-plugin-kubernetes-metrics (1.1.6) fluentd (>= 1.9.1) kubeclient (~> 4.6.0) multi_json (~> 1.14.1) @@ -10,26 +10,26 @@ PATH 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) attr_required (1.0.1) bigdecimal (3.0.0) - 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 @@ -40,17 +40,17 @@ GEM fluentd (>= 0.14.0, < 1.12) kubeclient (< 5) lru_redux - fluent-plugin-prometheus (1.8.5) + fluent-plugin-prometheus (2.0.1) 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-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) fluentd (1.11.5) cool.io (>= 1.4.5, < 2.0.0) http_parser.rb (>= 0.5.1, < 0.7.0) @@ -67,14 +67,14 @@ 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) @@ -89,8 +89,8 @@ 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.14.1) @@ -108,25 +108,23 @@ GEM validate_email validate_url webfinger (>= 1.0.1) - 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) - 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) @@ -161,7 +159,7 @@ DEPENDENCIES fluent-plugin-jq (= 0.5.1) fluent-plugin-kubernetes-metrics! fluent-plugin-kubernetes_metadata_filter (= 2.5.3) - fluent-plugin-prometheus (= 1.8.5) + fluent-plugin-prometheus (>= 2.0) fluent-plugin-record-modifier (= 2.1.0) fluent-plugin-splunk-hec (>= 1.2.5) fluentd (= 1.11.5) diff --git a/docker/build.sh b/docker/build.sh index fdf1ca9..a0601e1 100755 --- 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 --no-cache -t splunk/k8s-metrics:$TAG ./docker +docker build --no-cache --pull --build-arg VERSION=$VERSION --no-cache -t splunk/k8s-metrics:$TAG ./docker