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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 370ec547a0054f520882a8399fc32cd4b73178b20cfaae1c5ebc915325b4e3bd
-  data.tar.gz: ce3caa0bdf8a4f5dfc32b2819cf56d2cec1bde2887b7c13f5c7e6455ed2120e4
+  metadata.gz: 21041b7e0cd24078614d47d6e4cc8fc75138d8d58c526caea01bc18f42501133
+  data.tar.gz: 4ce441084243286718d3c46901ac17f1fc8bcf5f2bd1f7355ca5ae3a873f4076
 SHA512:
-  metadata.gz: 44ea016b3e59addf6be13d917e69a7ee677ac339b7d9053299b1d9202b4c538d2b8fe11235710b9ed693241c56a00a6d97ea5cf511fe03396dd3edf07cf955d3
-  data.tar.gz: e80b69a0d5f0cb7cacf74661488a263b66f41d0704313800d49c525313f907095386a10145a29c796009c72f4cc367038bf0dc14fcf62c2b3526d64216a93253
+  metadata.gz: b4644e9e65e010c942e241aab276cd9d458096505339312c090bdcfcc276c327c9421fd15a2c2b918480f2b16e694eb3bdd6a3b26c37ff8e727621fe778f512b
+  data.tar.gz: 3bc538ccb8b5b39ceb67e1dce44ca32d002a04b5be8200618170c7df0c0b5c7165bdb6b970accee64d7f11b0b90dd20d60bfe3afbd529738754a9e4770c32b5c

data/.circleci/config.yml

@@ -67,48 +67,6 @@ jobs:
           command: |
             .circleci/trigger_func_test.sh develop
 
-  release:
-    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: Install dependencies
-          command: |
-            .circleci/install_dep.sh
-      - run:
-          name: Build and push docker image to dockerhub
-          command: |
-            .circleci/build_and_push_to_dockerhub.sh
-      - run:
-          name: Upload gem to Github
-          command: |
-            .circleci/build_and_push_to_github_release.sh
-      - run:
-          name: Upload gem to Ruby Gem
-          command: |
-            .circleci/push_gem_to_rubygems.sh
-
-  check_version:
-    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: Check VERSION file for change
-          command: |
-            .circleci/check_version_trigger_release.sh
-
 workflows:
   version: 2
   build_test_push:
@@ -128,29 +86,3 @@ workflows:
       - func_test_develop:
           requires:
             - unit_test
-      - check_version:
-          requires:
-            - func_test_master
-            - func_test_develop
-          filters:
-            branches:
-              only: develop
-  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:
-            - func_test_master
-            - func_test_develop

data/.circleci/trigger_func_test.sh

@@ -11,6 +11,7 @@ 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)
+sleep 10
 
 # Wait until finish or maximum 20 minutes
 TIMEOUT=20

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-k8s-metrics-agg (1.1.2)
+    fluent-plugin-k8s-metrics-agg (1.1.3)
       fluentd (~> 1.9.1)
       kubeclient (~> 4.6.0)
       multi_json (~> 1.14.1)
@@ -46,7 +46,7 @@ GEM
     http-parser (1.2.1)
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.6.0)
-    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)
@@ -60,7 +60,7 @@ GEM
     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)
@@ -98,7 +98,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 2.0)
   fluent-plugin-k8s-metrics-agg!
-  rake (~> 12.0)
+  rake (~> 13.0)
   simplecov (~> 0.16.1)
   test-unit (~> 3.3.0)
   webmock (~> 3.5.1)

data/Makefile

@@ -0,0 +1,32 @@
+VERSION := $(shell sh -c 'cat VERSION')
+
+clean_pkg: 
+	@rm -rf pkg/* docker/*.gem 
+
+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
+	@cp pkg/fluent-plugin-*.gem docker
+	@mkdir -p docker/licenses
+	@cp -rp LICENSE docker/licenses/
+	@docker build --no-cache --pull --build-arg VERSION=$(VERSION) -t splunk/k8s-metrics-aggr:$(VERSION) ./docker
+
+unit-test: 
+	@bundle exec rake test
+
+install-deps:
+	@gem install bundler
+	@bundle update --bundler
+	@bundle install
+
+unpack: build
+	@cp pkg/fluent-plugin-*.gem docker
+	@gem unpack docker/fluent-plugin-*.gem --target docker/gem
+	@cd docker && bundle install

data/Rakefile

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

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.1.3

data/docker/Dockerfile

@@ -2,8 +2,6 @@ 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." \
@@ -22,13 +20,13 @@ COPY *.gem /tmp/
 
 COPY Gemfile* ./
 RUN gem install bundler \
-   && bundle install \
-   && bundle exec gem install /tmp/*.gem
+   && gem unpack /tmp/*.gem --target gem \
+   && bundle install
 
 RUN groupadd -r $FLUENT_USER && \
   useradd -r -g $FLUENT_USER $FLUENT_USER && \
-  mkdir -p /fluentd/log fluentd/etc /fluentd/plugins &&\
+  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
+CMD bundle exec fluentd -c /fluentd/etc/fluent.conf

data/docker/Gemfile

@@ -12,4 +12,6 @@ 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"
+gem "fluent-plugin-splunk-hec", ">= 1.2.3"
+
+gem 'fluent-plugin-k8s-metrics-agg', path: 'gem/'

data/docker/Gemfile.lock

@@ -1,9 +1,18 @@
+PATH
+  remote: gem
+  specs:
+    fluent-plugin-k8s-metrics-agg (1.1.3)
+      fluentd (~> 1.9.1)
+      kubeclient (~> 4.6.0)
+      multi_json (~> 1.14.1)
+      oj (~> 3.10.2)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.4.1)
-      activesupport (= 5.2.4.1)
-    activesupport (5.2.4.1)
+    activemodel (5.2.4.3)
+      activesupport (= 5.2.4.3)
+    activesupport (5.2.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -23,20 +32,13 @@ GEM
     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)
+    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)
@@ -74,7 +76,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)
@@ -102,13 +103,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)
@@ -148,9 +149,10 @@ PLATFORMS
 
 DEPENDENCIES
   bigdecimal (= 1.4.3)
+  fluent-plugin-k8s-metrics-agg!
   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)

data/docker/build.sh

@@ -16,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 --build-arg VERSION=$VERSION --no-cache -t splunk/k8s-metrics-aggr:$TAG ./docker
+docker build --no-cache --pull --build-arg VERSION=$VERSION --no-cache -t splunk/k8s-metrics-aggr:$TAG ./docker

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

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-k8s-metrics-agg
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Splunk Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
@@ -144,15 +144,8 @@ 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/gem_credentials"
 - ".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"
@@ -165,6 +158,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- Makefile
 - README.md
 - Rakefile
 - VERSION

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-k8s-metrics-agg-*.gem docker
-docker build --build-arg VERSION=$FLUENTD_HEC_GEM_VERSION --no-cache -t splunk/fluent-plugin-k8s-metrics-agg:metrics-aggregator ./docker
-docker tag splunk/fluent-plugin-k8s-metrics-agg:metrics-aggregator $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/k8s-ci-metrics-agg:latest
-echo "Push docker image to ecr..."
-docker push $AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/k8s-ci-metrics-agg:latest | awk 'END{print}'
-echo "Docker image pushed successfully."

data/.circleci/build_and_push_to_dockerhub.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-set -e
-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=$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/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,29 +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"
-        # Checkout develop and pull latest
-        git checkout develop
-        git pull origin develop
-        # merge it to master branch
-        git checkout 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/gem_credentials

@@ -1,2 +0,0 @@
----
-:rubygems_api_key: __RUBYGEMS_API_KEY__

data/.circleci/push_gem.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -e
-sudo apt-get update
-sudo apt-get install -y python-pip libpython-dev > /dev/null 2>&1
-echo "Installing aws cli..."
-sudo pip install awscli > /dev/null 2>&1
-echo "Pushing metrics-aggregator gem to s3..."
-aws s3 cp /tmp/pkg/*.gem s3://k8s-ci-artifacts/

data/.circleci/push_gem_to_rubygems.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e
-echo "Pushing metrics aggr gem to rubygems.org..."
-echo "gem `gem --version`"
-cat .circleci/gem_credentials | sed -e "s/__RUBYGEMS_API_KEY__/${RUBYGEMS_API_KEY}/" > ~/.gem/credentials
-chmod 0600 ~/.gem/credentials
-gem push /tmp/pkg/fluent-plugin-k8s-metrics-agg-*.gem