fluent-plugin-kubernetes-metrics 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1f36a82ebc0cee28ecb843e8e64c0f85008fd086cc16aa7b4422c498a4cf2a4
-  data.tar.gz: 71c811c41034345247cb9d8da1c4737372d5821193cc05bf1835660a64805da3
+  metadata.gz: ca11780c53ec485dd7470ee5b0d644983f75b25d55f7625666fd682868a0e361
+  data.tar.gz: 90a5ffe9e4430c108e863e26fc3dfdeb4c6b667e7683a1de7d1d05de8825e06b
 SHA512:
-  metadata.gz: 5327e6c146ab8b09cbc0d2dc2ba3d31aa8034362e0a4023ea2cbbad7a8a216b767ca7a531197becd9779623097fec5fcf31f99d2526d7cca3faf2d08c63566f5
-  data.tar.gz: f707fcb64146bcc810da2ddb003849e119a8f2a04521d1679093181b3cdbb37b01df9a29c7bde303c5990de29985d9e38ac2b45cdb36629df59c32529d8ee23c
+  metadata.gz: e236979695bbf3cf714d9fc8e43fa9a0214deeb7e033ef039f81c19290c5cffd090567a72dc9bc57be3cf201e5a656cf38ba924c5439c7f33978eeeb21f21af5
+  data.tar.gz: 60d7d6b96b01f92a1754bfdf9e152eff7f07987f6a85ab00cdbfde23001ee19356a8b89d62da9f9be47b95d07fc1a8b7194efd00bdc610e7b4a3ce3328827881

data/Gemfile.lock

@@ -1,61 +1,66 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-metrics (1.1.2)
-      fluentd (~> 1.4.0)
-      kubeclient (~> 4.2.2)
-      multi_json (~> 1.13.1)
-      oj (~> 3.7.9)
+    fluent-plugin-kubernetes-metrics (1.1.4)
+      fluentd (~> 1.9.1)
+      kubeclient (~> 4.6.0)
+      multi_json (~> 1.14.1)
+      oj (~> 3.10.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    cool.io (1.5.4)
+    concurrent-ruby (1.1.6)
+    cool.io (1.6.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    dig_rb (1.0.1)
     docile (1.3.1)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    fluentd (1.4.2)
+    ffi (1.12.2)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    fluentd (1.9.2)
       cool.io (>= 1.4.5, < 2.0.0)
-      dig_rb (~> 1.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
-      msgpack (>= 0.7.0, < 2.0.0)
+      msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.0.4, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.2, < 1.0.0)
-      tzinfo (~> 1.0)
+      tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
       yajl-ruby (~> 1.0)
     hashdiff (0.3.8)
-    http (3.3.0)
+    http (4.3.0)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
-      http-form_data (~> 2.0)
-      http_parser.rb (~> 0.6.0)
+      http-form_data (~> 2.2)
+      http-parser (~> 1.2.0)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (2.1.1)
+    http-form_data (2.2.0)
+    http-parser (1.2.1)
+      ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.6.0)
-    json (2.1.0)
-    kubeclient (4.2.2)
-      http (~> 3.0)
+    json (2.3.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)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
-    msgpack (1.3.1)
-    multi_json (1.13.1)
+    msgpack (1.3.3)
+    multi_json (1.14.1)
     netrc (0.11.0)
-    oj (3.7.12)
+    oj (3.10.2)
     power_assert (1.1.3)
     public_suffix (3.0.3)
-    rake (12.3.2)
+    rake (13.0.1)
     recursive-open-struct (1.1.0)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
@@ -63,7 +68,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     safe_yaml (1.0.4)
-    serverengine (2.1.1)
+    serverengine (2.2.1)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     simplecov (0.16.1)
@@ -74,9 +79,8 @@ GEM
     strptime (0.2.3)
     test-unit (3.3.0)
       power_assert
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.1)
+      concurrent-ruby (~> 1.0)
     tzinfo-data (1.2019.3)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
@@ -92,12 +96,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0.0)
+  bundler (~> 2.0)
   fluent-plugin-kubernetes-metrics!
-  rake (~> 12.3.2)
+  rake (~> 13.0)
   simplecov (~> 0.16.1)
   test-unit (~> 3.3.0)
   webmock (~> 3.5.1)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/Rakefile

@@ -24,6 +24,6 @@ namespace :docker do
     raise 'Argument `tag` was not provided.' unless args.tag
 
     cp Dir['pkg/fluent-plugin-kubernetes-metrics-*.gem'], 'docker/'
-    sh "docker build  --no-cache -t splunk/connect-for-kubernetes:#{args.tag} ./docker"
+    sh "docker build --no-cache --pull --build-arg VERSION=$(cat VERSION) --no-cache -t splunk/connect-for-kubernetes:#{args.tag} ./docker"
   end
 end

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.4

data/fluent-plugin-kubernetes-metrics.gemspec

@@ -10,20 +10,22 @@ Gem::Specification.new do |spec|
   spec.description   = 'A fluentd input plugin that collects node and container metrics from a kubernetes cluster.'
   spec.homepage      = 'https://github.com/splunk/fluent-plugin-kubernetes-metrics'
   spec.license       = 'Apache-2.0'
-  test_files, files  = `git ls-files -z`.split("\x0").partition do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.files         = files
-  spec.executables   = files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = test_files
+
+  spec.files         = %w[
+    metrics-information.md README.md LICENSE
+    fluent-plugin-kubernetes-metrics.gemspec
+    Gemfile Gemfile.lock
+    Rakefile VERSION
+  ] + Dir.glob('lib/**/**').reject(&File.method(:directory?))
+  spec.test_files    = Dir.glob('test/**/**.rb')
   spec.require_paths = ['lib']
-  spec.add_development_dependency 'bundler', '~> 2.0.0'
-  spec.add_development_dependency 'rake', '~> 12.3.2'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
   spec.add_development_dependency 'test-unit', '~> 3.3.0'
   spec.add_development_dependency 'webmock', '~> 3.5.1'
-  spec.add_runtime_dependency 'fluentd', '~> 1.4.0'
-  spec.add_runtime_dependency 'kubeclient', '~> 4.2.2'
-  spec.add_runtime_dependency 'multi_json', '~> 1.13.1'
-  spec.add_runtime_dependency 'oj', '~> 3.7.9'
+  spec.add_runtime_dependency 'fluentd', '~> 1.9.1'
+  spec.add_runtime_dependency 'kubeclient', '~> 4.6.0'
+  spec.add_runtime_dependency 'multi_json', '~> 1.14.1'
+  spec.add_runtime_dependency 'oj', '~> 3.10.2'
 end

data/lib/fluent/plugin/in_kubernetes_metrics.rb

@@ -202,11 +202,11 @@ module Fluent
         if env_host && env_port
           if @use_rest_client_ssl
             @kubelet_url = "https://#{env_host}:#{env_port}/stats/summary"
-            @kubelet_url_stats = "https://#{env_host}:#{env_port}/stats/"
+            @kubelet_url_stats = "https://#{env_host}:#{env_port}/stats"
             @cadvisor_url = "https://#{env_host}:#{env_port}/metrics/cadvisor"
           else
             @kubelet_url = "http://#{env_host}:#{env_port}/stats/summary"
-            @kubelet_url_stats = "http://#{env_host}:#{env_port}/stats/"
+            @kubelet_url_stats = "http://#{env_host}:#{env_port}/stats"
             @cadvisor_url = "http://#{env_host}:#{env_port}/metrics/cadvisor"
           end
         end
@@ -275,7 +275,7 @@ module Fluent
         @stats_api =
           begin
             @client.discover unless @client.discovered
-            @client.rest_client["/nodes/#{node}:#{@kubelet_port}/proxy/stats/"].tap do |endpoint|
+            @client.rest_client["/nodes/#{node}:#{@kubelet_port}/proxy/stats"].tap do |endpoint|
               log.info("Use URL #{endpoint.url} for scraping stats metrics")
             end
           end

data/test/helper.rb

@@ -34,7 +34,7 @@ module PluginTestHelper
   end
 
   def kubelet_stats_api_url
-    'http://generics-aws-node-name:10255/stats/'
+    'http://generics-aws-node-name:10255/stats'
   end
 
   def kubelet_cadvisor_api_url
@@ -113,7 +113,7 @@ module PluginTestHelper
 
   def stub_metrics_proxy_stats
     open(File.expand_path('stats.json', __dir__)).tap do |f|
-      stub_request(:get, "#{k8s_url}/v1/nodes/generics-aws-node-name:10255/proxy/stats/")
+      stub_request(:get, "#{k8s_url}/v1/nodes/generics-aws-node-name:10255/proxy/stats")
         .to_return(body: f.read)
     end.close
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-kubernetes-metrics
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -86,56 +86,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: kubeclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.2
+        version: 4.6.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.13.1
+        version: 1.14.1
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.9
+        version: 3.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.9
+        version: 3.10.2
 description: A fluentd input plugin that collects node and container metrics from
   a kubernetes cluster.
 email:
@@ -144,47 +144,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/build_and_push.sh"
-- ".circleci/build_and_push_to_dockerhub.sh"
-- ".circleci/build_and_push_to_github_release.sh"
-- ".circleci/check_version_trigger_release.sh"
-- ".circleci/config.yml"
-- ".circleci/install_dep.sh"
-- ".circleci/push_gem.sh"
-- ".circleci/push_gems_to_rubygems.sh"
-- ".github/ISSUE_TEMPLATE/bug_report.md"
-- ".github/ISSUE_TEMPLATE/enhancement_request.md"
-- ".github/ISSUE_TEMPLATE/failing_test.md"
-- ".github/PULL_REQUEST_TEMPLATE.md"
-- ".gitignore"
-- CLA.md
-- CONTRIBUTING.md
-- CONTRIBUTORS.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - VERSION
-- docker/CONTRIBUTING.md
-- docker/Dockerfile
-- docker/FLUENTD_HEC_GEM_VERSION
-- docker/LICENSE
-- docker/README.md
-- docker/entrypoint.sh
-- examples/daemonset.yaml
 - fluent-plugin-kubernetes-metrics.gemspec
 - lib/fluent/plugin/in_kubernetes_metrics.rb
 - metrics-information.md
-- test/api.json
 - test/helper.rb
-- test/metrics_cadvisor.txt
 - test/plugin/test_in_kubernetes_metrics.rb
 - test/plugin/test_missing_timestamps.rb
-- test/stats.json
-- test/unit.json
-- test/unit_without_time.json
-- test/v1.json
 homepage: https://github.com/splunk/fluent-plugin-kubernetes-metrics
 licenses:
 - Apache-2.0
@@ -204,17 +175,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.1
 signing_key: 
 specification_version: 4
 summary: A fluentd input plugin that collects kubernetes cluster metrics.
 test_files:
-- test/api.json
 - test/helper.rb
-- test/metrics_cadvisor.txt
-- test/plugin/test_in_kubernetes_metrics.rb
 - test/plugin/test_missing_timestamps.rb
-- test/stats.json
-- test/unit.json
-- test/unit_without_time.json
-- test/v1.json
+- test/plugin/test_in_kubernetes_metrics.rb

data/.circleci/build_and_push.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-set -e
-FLUENTD_HEC_GEM_VERSION=`cat docker/FLUENTD_HEC_GEM_VERSION`
-aws ecr get-login --region $AWS_REGION --no-include-email | bash
-echo "Building docker image..."
-cp /tmp/pkg/fluent-plugin-kubernetes-metrics-*.gem docker
-docker build --build-arg VERSION=$FLUENTD_HEC_GEM_VERSION --no-cache -t splunk/fluent-plugin-kubernetes-metrics:metrics ./docker
-docker tag splunk/fluent-plugin-kubernetes-metrics:metrics $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/k8s-ci-metrics:latest
-echo "Push docker image to ecr..."
-docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/k8s-ci-metrics:latest | awk 'END{print}'
-echo "Docker image pushed successfully."

data/.circleci/build_and_push_to_dockerhub.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-set -e
-FLUENTD_HEC_GEM_VERSION=`cat docker/FLUENTD_HEC_GEM_VERSION`
-echo "Building docker image..."
-cp /tmp/pkg/fluent-plugin-kubernetes-metrics-*.gem docker
-VERSION=`cat VERSION`
-docker build --build-arg VERSION=$FLUENTD_HEC_GEM_VERSION --no-cache -t splunk/fluent-plugin-kubernetes-metrics:ci ./docker
-docker tag splunk/fluent-plugin-kubernetes-metrics:ci splunk/${DOCKERHUB_REPO_NAME}:${VERSION}
-echo "Push docker image to splunk dockerhub..."
-docker login --username=$DOCKERHUB_ACCOUNT_ID --password=$DOCKERHUB_ACCOUNT_PASS
-docker push splunk/${DOCKERHUB_REPO_NAME}:${VERSION} | awk 'END{print}'
-echo "Docker image pushed successfully to docker-hub."

data/.circleci/build_and_push_to_github_release.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-set -e
-wget https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz
-tar -xzvf ghr_v0.12.0_linux_amd64.tar.gz
-sudo chmod +x ghr_v0.12.0_linux_amd64
-sudo mv ghr_v0.12.0_linux_amd64/ghr /usr/local/bin/ghr
-
-VERSION=`cat VERSION`
-echo "Pushing SCK release to github releases...${VERSION}"
-
-ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -n "${RELEASE_TITLE}" -b "${RELEASE_BODY}" -draft ${VERSION} /tmp/pkg/

data/.circleci/check_version_trigger_release.sh

@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-#!/usr/bin/env bash
-LATEST_COMMIT=$(git rev-parse HEAD)
-VERSION_COMMIT=$(git log -1 --format=format:%H VERSION)
-if [ $VERSION_COMMIT = $LATEST_COMMIT ];
-    then
-        if [ -s VERSION ] # Check if content is empty
-            then 
-                VERSION=`cat VERSION`
-                echo "VERSION is changed to $VERSION" 
-            else 
-                echo "[ERROR] VERSION file is empty."
-                exit 1
-        fi 
-        git config user.email "splunk-oss-admin@splunk.com"
-        git config user.name "splunk-oss-admin"
-        git checkout develop
-        git pull origin develop
-        git checkout -b release/$VERSION origin/develop
-        git push https://$RELEASE_GITHUB_USER:$RELEASE_GITHUB_PASS@github.com/splunk/fluent-plugin-kubernetes-metrics.git release/$VERSION
-        git checkout master
-        git merge --no-edit release/$VERSION
-        git push https://$RELEASE_GITHUB_USER:$RELEASE_GITHUB_PASS@github.com/splunk/fluent-plugin-kubernetes-metrics.git master
-fi