fluent-plugin-k8s-metrics-agg 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dafdc24e3159101b532162d528800ee781dc5a10c62824a97cc3b5506c977ae0
-  data.tar.gz: d40d159adcac648fee03f13fe88697c5491208ef0557adc4074726be50d88eaa
+  metadata.gz: 370ec547a0054f520882a8399fc32cd4b73178b20cfaae1c5ebc915325b4e3bd
+  data.tar.gz: ce3caa0bdf8a4f5dfc32b2819cf56d2cec1bde2887b7c13f5c7e6455ed2120e4
 SHA512:
-  metadata.gz: 7ace62d329f0b1f316563d758e9a7ca045914d37811606ce6e07f9fb807c2b3cf907d3dd025983356097c813308b191b77677ddbfbbba56d50fe9aa5c7744786
-  data.tar.gz: 456d5c39db1fc1dc0d159c920dd612dc39f474b6d873b3963ee42dbbc7ade903079b113b844c3ef16e2830b545f583f3383caafccec42943f3d96ed0f6d72c4e
+  metadata.gz: 44ea016b3e59addf6be13d917e69a7ee677ac339b7d9053299b1d9202b4c538d2b8fe11235710b9ed693241c56a00a6d97ea5cf511fe03396dd3edf07cf955d3
+  data.tar.gz: e80b69a0d5f0cb7cacf74661488a263b66f41d0704313800d49c525313f907095386a10145a29c796009c72f4cc367038bf0dc14fcf62c2b3526d64216a93253

data/.circleci/build_and_push_to_dockerhub.sh

@@ -1,12 +1,16 @@
 #!/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-k8s-metrics-agg-*.gem docker
+echo "Copying licenses to be included in the docker image..."
+mkdir docker/licenses
+cp -rp LICENSE docker/licenses/
 VERSION=`cat VERSION`
-docker build --build-arg VERSION=$FLUENTD_HEC_GEM_VERSION --no-cache -t splunk/fluent-plugin-k8s-metrics-agg:metrics-aggregator ./docker
+docker build --build-arg VERSION=$VERSION --no-cache -t splunk/fluent-plugin-k8s-metrics-agg:metrics-aggregator ./docker
 docker tag splunk/fluent-plugin-k8s-metrics-agg:metrics-aggregator splunk/${DOCKERHUB_REPO_NAME}:${VERSION}
+docker tag splunk/fluent-plugin-k8s-metrics-agg:metrics-aggregator splunk/${DOCKERHUB_REPO_NAME}:latest
 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}'
+docker push splunk/${DOCKERHUB_REPO_NAME}:latest | awk 'END{print}'
 echo "Docker image pushed successfully to docker-hub."

data/.circleci/check_version_trigger_release.sh

@@ -16,11 +16,14 @@ if [ $VERSION_COMMIT = $LATEST_COMMIT ];
         fi 
         git config user.email "splunk-oss-admin@splunk.com"
         git config user.name "splunk-oss-admin"
+        # Checkout develop and pull latest
         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-k8s-metrics-agg.git release/$VERSION
+        # merge it to master branch
         git checkout master
-        git merge --no-edit release/$VERSION
-        git push https://$RELEASE_GITHUB_USER:$RELEASE_GITHUB_PASS@github.com/splunk/fluent-plugin-k8s-metrics-agg.git master
+        git merge --no-edit -X theirs develop
+        git push
+        # cut release branch from master
+        git checkout -b release/$VERSION
+        git push https://$RELEASE_GITHUB_USER:$RELEASE_GITHUB_PASS@github.com/splunk/fluent-plugin-k8s-metrics-agg.git release/$VERSION
 fi

data/.circleci/config.yml

@@ -22,7 +22,7 @@ jobs:
           paths:
             - pkg
 
-  test:
+  unit_test:
     docker:
       - image: circleci/ruby:2.6.1-node-browsers
     working_directory: ~/repo
@@ -39,26 +39,33 @@ jobs:
       - run:
           name: Run unit tests
           command: |
-            rake test -t -v
+            bundle exec rake test -t -v
 
-  push:
+  func_test_master:
     docker:
       - image: circleci/ruby:2.6.1-node-browsers
     working_directory: ~/repo
     steps:
-      - attach_workspace:
-          at: /tmp
       - checkout
       - setup_remote_docker:
           reusable: true
       - run:
-          name: Push rubygem to s3
+          name: trigger
           command: |
-            .circleci/push_gem.sh
+            .circleci/trigger_func_test.sh master
+
+  func_test_develop:
+    docker:
+      - image: circleci/ruby:2.6.1-node-browsers
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - setup_remote_docker:
+          reusable: true
       - run:
-          name: Build and push docker image to ecr
+          name: trigger
           command: |
-            .circleci/build_and_push.sh
+            .circleci/trigger_func_test.sh develop
 
   release:
     docker:
@@ -85,7 +92,7 @@ jobs:
       - run:
           name: Upload gem to Ruby Gem
           command: |
-            .circleci/push_gems_to_rubygems.sh
+            .circleci/push_gem_to_rubygems.sh
 
   check_version:
     docker:
@@ -109,25 +116,41 @@ workflows:
       - build:
           filters:
             branches:
-              ignore: /^release\/.*/
-      - test:
+              ignore: 
+                - /^release\/.*/
+                - master
+      - unit_test:
           requires:
             - build
-      - push:
+      - func_test_master:
           requires:
-            - test
+            - unit_test
+      - func_test_develop:
+          requires:
+            - unit_test
+      - check_version:
+          requires:
+            - func_test_master
+            - func_test_develop
           filters:
             branches:
               only: develop
-      - check_version:
-          requires:
-            - push
   release:
     jobs:
       - build:
           filters:
             branches:
               only: master
+      - unit_test:
+          requires:
+            - build
+      - func_test_master:
+          requires:
+            - unit_test
+      - func_test_develop:
+          requires:
+            - unit_test
       - release:
           requires:
-          - build
+            - func_test_master
+            - func_test_develop

data/.circleci/trigger_func_test.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+# trigger SCK 'master' branch to introduce this new image from this commit 
+# to working version of every other component.
+ORGANIZATION=splunk
+PROJECT=splunk-connect-for-kubernetes
+BRANCH=$1
+
+# Trigger functional test
+curl -X POST --header "Content-Type: application/json" \
+    -d '{"build_parameters": {"CIRCLE_JOB":"build_test", "TRIG_BRANCH":"'"$CIRCLE_BRANCH"'", "TRIG_PROJECT":"'"$CIRCLE_PROJECT_REPONAME"'", "TRIG_REPO":"'"$CIRCLE_REPOSITORY_URL"'"}}' "https://circleci.com/api/v1/project/$ORGANIZATION/$PROJECT/tree/$BRANCH?circle-token=$CIRCLE_TOKEN" > build.json
+cat build.json
+BUILD_NUM=$(jq -r .build_num build.json)
+
+# Wait until finish or maximum 20 minutes
+TIMEOUT=20
+DONE="FALSE"
+until [ "$TIMEOUT" -lt 0 ] || [ "$DONE" == "TRUE" ]; do
+    curl https://circleci.com/api/v1/project/$ORGANIZATION/$PROJECT/$BUILD_NUM?circle-token=$CIRCLE_TOKEN > build_progress.json
+    STATUS=$(jq -r .status build_progress.json)
+    echo "STATUS = $STATUS"
+    if [ "$STATUS" != "running" ] && [ "$STATUS" != "queued" ]; then
+        DONE="TRUE"
+    else
+        let TIMEOUT--
+        sleep 60
+    fi
+done
+
+BUILD_URL=$(jq -r .build_url build_progress.json)
+if [ "$DONE" == "FALSE" ]; then
+    # Cancel hanging job and fail
+    curl -X POST https://circleci.com/api/v1/project/$ORGANIZATION/$PROJECT/$BUILD_NUM/cancel?circle-token=$CIRCLE_TOKEN
+else
+    if [ "$STATUS" != "success" ] && [ "$STATUS" != "fixed" ]; then
+        echo "Functional test have failed please see:"
+        echo $BUILD_URL
+        exit 1
+    fi
+    exit 0
+fi

data/.gitignore

@@ -3,3 +3,7 @@ vendor
 pkg
 coverage/
 .idea/
+docker/.bundle/
+docker/gem/
+docker/gems/
+docker/licenses/

data/Gemfile.lock

@@ -1,58 +1,63 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-k8s-metrics-agg (1.1.1)
-      fluentd (~> 1.3.3)
-      kubeclient (~> 4.2.2)
-      multi_json (~> 1.13.1)
-      oj (~> 3.7.8)
+    fluent-plugin-k8s-metrics-agg (1.1.2)
+      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.3.3)
+    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)
+    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)
@@ -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.1)
+  bundler (~> 2.0)
   fluent-plugin-k8s-metrics-agg!
-  rake (~> 12.3.2)
+  rake (~> 12.0)
   simplecov (~> 0.16.1)
   test-unit (~> 3.3.0)
   webmock (~> 3.5.1)
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/docker/Dockerfile

@@ -1,52 +1,34 @@
-FROM alpine:3.8
-
-LABEL maintainer="Splunk Inc. <DataEdge@splunk.com>"
-LABEL Description="Splunk Connect for Kubernetes docker image" Vendor="Splunk Inc."
+FROM registry.access.redhat.com/ubi8/ruby-25
 
 ARG VERSION
+
+MAINTAINER DataEdge DataEdge@splunk.com
+
+LABEL name="Splunk Connect for Kubernetes Metrics Aggregator container" \
+      maintainer="DataEdge@splunk.com" \
+      vendor="Splunk Inc." \
+      version=${VERSION} \
+      release=${VERSION} \
+      summary="Splunk Connect for Kubernetes Metrics Aggregator container" \
+      description="Splunk Connect for Kubernetes Metrics Aggregator container"
+
 ENV VERSION=${VERSION}
+ENV FLUENT_USER fluent
 
-ENV DUMB_INIT_VERSION=1.2.1
-ENV SU_EXEC_VERSION=0.2
+USER root
+COPY licenses /licenses
 
 COPY *.gem /tmp/
 
-ARG DEBIAN_FRONTEND=noninteractive
-# Do not split this into multiple RUN!
-# Docker creates a layer for every RUN-Statement
-# therefore an 'apk delete' has no effect
-RUN apk update \
- && apk upgrade \
- && apk add --no-cache \
-        ca-certificates \
- && update-ca-certificates \
- && apk add --no-cache \
-        ruby ruby-irb ruby-etc ruby-webrick ruby-json \
-        su-exec==${SU_EXEC_VERSION}-r0 \
-        dumb-init==${DUMB_INIT_VERSION}-r0 \
- && apk add --no-cache --virtual .build-deps \
-        build-base \
-        ruby-dev wget gnupg \
- && echo 'gem: --no-document' >> /etc/gemrc \
- && gem install -N \
-            fluentd:1.4.0 \
-            fluent-plugin-record-modifier:2.0.1 \
-            fluent-plugin-splunk-hec:${VERSION} \
-            oj:3.7.9 \
-            multi_json:1.13.1 \
-            bigdecimal:1.4.3 \
-            kubeclient:4.3.0 \
- && gem install -N /tmp/*.gem \
- && apk del .build-deps \
- && rm -rf /var/cache/apk/* \
- && rm -rf /tmp/* /var/tmp/* /usr/lib/ruby/gems/*/cache/*.gem
-
-ENV LD_PRELOAD="" \
-    FLUENTD_CONF="fluent.conf" \
-    FLUENTD_OPT="" \
-    DUMB_INIT_SETSID=0
-
-COPY entrypoint.sh /bin/entrypoint.sh
-ENTRYPOINT ["/bin/entrypoint.sh"]
-
-CMD exec fluentd -c /fluentd/etc/${FLUENTD_CONF} -p /fluentd/plugins $FLUENTD_OPT
+COPY Gemfile* ./
+RUN gem install bundler \
+   && bundle install \
+   && bundle exec gem install /tmp/*.gem
+
+RUN groupadd -r $FLUENT_USER && \
+  useradd -r -g $FLUENT_USER $FLUENT_USER && \
+  mkdir -p /fluentd/log fluentd/etc /fluentd/plugins &&\
+  chown -R $FLUENT_USER /fluentd && chgrp -R $FLUENT_USER /fluentd
+
+USER $FLUENT_USER
+CMD exec fluentd -c /fluentd/etc/fluent.conf

data/docker/FLUENTD_HEC_GEM_VERSION

@@ -1 +1 @@
-1.1.2
+1.2.1

data/docker/Gemfile

@@ -0,0 +1,15 @@
+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.9.1" 
+gem "fluent-plugin-prometheus", "=1.7.0"
+gem "fluent-plugin-record-modifier", "=2.1.0"
+gem "kubeclient", "=4.6.0"
+gem "oj", "=3.10.2"
+gem 'multi_json', '=1.14.1'
+gem 'http_parser.rb', '=0.5.3'
+gem 'bigdecimal', '=1.4.3'
+
+gem "fluent-plugin-splunk-hec", "= 1.2.1"

data/docker/Gemfile.lock

@@ -0,0 +1,161 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.2.4.1)
+      activesupport (= 5.2.4.1)
+    activesupport (5.2.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    aes_key_wrap (1.0.1)
+    attr_required (1.0.1)
+    bigdecimal (1.4.3)
+    bindata (2.4.4)
+    concurrent-ruby (1.1.6)
+    connection_pool (2.2.2)
+    cool.io (1.6.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    ffi (1.12.2)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    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)
+      fluentd (>= 1.4)
+      http_parser.rb (= 0.5.3)
+      multi_json (~> 1.13)
+      net-http-persistent (~> 3.1)
+      openid_connect (~> 1.1.8)
+      prometheus-client (< 0.10.0)
+    fluentd (1.9.1)
+      cool.io (>= 1.4.5, < 2.0.0)
+      http_parser.rb (>= 0.5.1, < 0.7.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, < 3.0)
+      tzinfo-data (~> 1.0)
+      yajl-ruby (~> 1.0)
+    http (4.3.0)
+      addressable (~> 2.3)
+      http-cookie (~> 1.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.2.0)
+    http-parser (1.2.1)
+      ffi-compiler (>= 1.0, < 2.0)
+    http_parser.rb (0.5.3)
+    httpclient (2.8.3)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    json-jwt (1.11.0)
+      activesupport (>= 4.2)
+      aes_key_wrap
+      bindata
+    kubeclient (4.6.0)
+      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)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.1009)
+    mini_mime (1.0.2)
+    minitest (5.14.0)
+    msgpack (1.3.3)
+    multi_json (1.14.1)
+    net-http-persistent (3.1.0)
+      connection_pool (~> 2.2)
+    netrc (0.11.0)
+    oj (3.10.2)
+    openid_connect (1.1.8)
+      activemodel
+      attr_required (>= 1.0.0)
+      json-jwt (>= 1.5.0)
+      rack-oauth2 (>= 1.6.1)
+      swd (>= 1.0.0)
+      tzinfo
+      validate_email
+      validate_url
+      webfinger (>= 1.0.1)
+    prometheus-client (0.9.0)
+      quantile (~> 0.2.1)
+    public_suffix (4.0.3)
+    quantile (0.2.1)
+    rack (2.2.2)
+    rack-oauth2 (1.10.1)
+      activesupport
+      attr_required
+      httpclient
+      json-jwt (>= 1.11.0)
+      rack
+    rake (13.0.1)
+    recursive-open-struct (1.1.0)
+    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.1)
+      sigdump (~> 0.2.2)
+    sigdump (0.2.4)
+    strptime (0.2.3)
+    swd (1.1.2)
+      activesupport (>= 3)
+      attr_required (>= 0.0.5)
+      httpclient (>= 2.4)
+    thread_safe (0.3.6)
+    tzinfo (1.2.6)
+      thread_safe (~> 0.1)
+    tzinfo-data (1.2019.3)
+      tzinfo (>= 1.0.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.6)
+    validate_email (0.1.6)
+      activemodel (>= 3.0)
+      mail (>= 2.2.5)
+    validate_url (1.0.8)
+      activemodel (>= 3.0.0)
+      public_suffix
+    webfinger (1.1.0)
+      activesupport
+      httpclient (>= 2.4)
+    yajl-ruby (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bigdecimal (= 1.4.3)
+  fluent-plugin-prometheus (= 1.7.0)
+  fluent-plugin-record-modifier (= 2.1.0)
+  fluent-plugin-splunk-hec (= 1.2.1)
+  fluentd (= 1.9.1)
+  http_parser.rb (= 0.5.3)
+  kubeclient (= 4.6.0)
+  multi_json (= 1.14.1)
+  oj (= 3.10.2)
+
+BUNDLED WITH
+   2.1.4

data/docker/build.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -e
+TAG=$1
+
+# Install dependecies
+gem install bundler
+bundle update --bundler
+bundle install
+
+# Build Gem
+bundle exec rake build -t -v
+cp pkg/fluent-plugin-*.gem docker
+
+# Build Docker Image
+VERSION=`cat VERSION`
+echo "Copying licenses to be included in the docker image..."
+mkdir -p docker/licenses
+cp -rp LICENSE docker/licenses/
+docker build --build-arg VERSION=$VERSION --no-cache -t splunk/k8s-metrics-aggr:$TAG ./docker

data/fluent-plugin-k8s-metrics-agg.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
@@ -20,14 +20,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = test_files
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'bundler', '~> 2.0.1'
-  spec.add_development_dependency 'rake', '~> 12.3.2'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'test-unit', "~> 3.3.0"
   spec.add_development_dependency "simplecov", '~> 0.16.1'
   spec.add_development_dependency 'webmock', '~> 3.5.1'
-  spec.add_runtime_dependency 'fluentd', '~> 1.3.3'
-  spec.add_runtime_dependency 'kubeclient', '~> 4.2.2'
-  spec.add_runtime_dependency 'multi_json', '~> 1.13.1'
-  spec.add_runtime_dependency 'oj', '~> 3.7.8'
+  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/test/helper.rb

@@ -1,5 +1,4 @@
 require 'simplecov'
-require 'fluent/plugin/in_kubernetes_metrics_aggregator.rb'
 SimpleCov.start
 
 $LOAD_PATH.unshift(File.expand_path('..', __dir__))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-k8s-metrics-agg
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2020-02-21 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.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -86,56 +86,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 1.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        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.8
+        version: 3.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.8
+        version: 3.10.2
 description: A fluentd input plugin that collects node and container metrics from
   a kubernetes cluster via kubeapiserver API.
 email:
@@ -153,6 +153,7 @@ files:
 - ".circleci/install_dep.sh"
 - ".circleci/push_gem.sh"
 - ".circleci/push_gem_to_rubygems.sh"
+- ".circleci/trigger_func_test.sh"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/enhancement_request.md"
 - ".github/ISSUE_TEMPLATE/failing_test.md"
@@ -170,8 +171,11 @@ files:
 - docker/CONTRIBUTING.md
 - docker/Dockerfile
 - docker/FLUENTD_HEC_GEM_VERSION
+- docker/Gemfile
+- docker/Gemfile.lock
 - docker/LICENSE
 - docker/README.md
+- docker/build.sh
 - docker/entrypoint.sh
 - fluent-plugin-k8s-metrics-agg.gemspec
 - lib/fluent/plugin/in_kubernetes_metrics_aggregator.rb
@@ -203,7 +207,7 @@ 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.