fluent-plugin-k8s-metrics-agg 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60991c52f3ffacbee65a82a67ccb02903417800ffd74287c0fbf322aa03a318e
-  data.tar.gz: 4dd9cf5ae9ee3699d27efd4495c8de0a493f8f9ed536fe03b9ee3dcaf269f8fe
+  metadata.gz: 1ed001cdfb56d96374f5fc2d09ee318827286b4fadefd0295d93b682cbe6921c
+  data.tar.gz: 2d863a2438ac373c19252f551c83c9e4d2b18e8042b656747597c093497e8a69
 SHA512:
-  metadata.gz: 2debd68c82b5d490f1d0b73b304bcf49a39555d24f96473845a21358490fb10bef343775d26963cbc652f6f8c72515931a0a7d2f0021ccc28efdb1271b8bec73
-  data.tar.gz: ad770e300cf2ec07a572c73650b1a06265bb8b0c8d59338535ed45ca4a44655c3dfaecc7acf578233e0273a363e66f80e38cb0710a7e79b358b538300368adb3
+  metadata.gz: 6230fa97e57503d1e120cb84e116be613429a441a4c0c7bd156001a6283a467ee5f430ff7baa269fc8df099564b8595222f62515d71f07fb57c3a58b8919ad13
+  data.tar.gz: 6b3acd0eff4fdb3155eb1cbc5629ec2a254965504ba647200067101d1bbe10a8ae33fddff6929f4264826bca343281a8c1082b30653fe8c8d5fbce0ac5f38f6a

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,67 +39,50 @@ jobs:
       - run:
           name: Run unit tests
           command: |
-            rake test -t -v
+            bundle exec rake test -t -v
 
-  push:
+  func_test_main:
     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
-      - run:
-          name: Build and push docker image to ecr
-          command: |
-            .circleci/build_and_push.sh
+            .circleci/trigger_func_test.sh main
 
-  release:
+  func_test_develop:
     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
+          name: trigger
           command: |
-            .circleci/build_and_push_to_github_release.sh
+            .circleci/trigger_func_test.sh develop
 
 workflows:
   version: 2
   build_test_push:
     jobs:
-      - build
-      - test:
+      - build:
+          filters:
+            branches:
+              ignore: 
+                - /^release\/.*/
+                - main
+      - unit_test:
           requires:
             - build
-      - push:
+      - func_test_main:
           requires:
-            - test
-          filters:
-            branches:
-              only: develop
-      - release:
+            - unit_test
+      - func_test_develop:
           requires:
-          - test
-          filters:
-            branches:
-              only: master
+            - unit_test

data/.circleci/trigger_func_test.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+# trigger SCK 'main' 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)
+sleep 10
+
+# 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/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Report a bug encountered while operating fluent-plugin-k8s-metrics-agg
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- Please use this template while reporting a bug and provide as much info as possible. Not doing so may result in your bug not being addressed in a timely manner. Thanks!
+
+Please do not report security vulnerabilities with public GitHub issue reports. Please report security issues here: https://www.splunk.com/goto/report_vulnerabilities_prodsec
+-->
+
+
+**What happened**:
+
+**What you expected to happen**:
+
+**How to reproduce it (as minimally and precisely as possible)**:
+
+**Anything else we need to know?**:
+
+**Environment**:
+- Kubernetes version (use `kubectl version`):
+- Ruby version (use `ruby --version`):
+- OS (e.g: `cat /etc/os-release`):
+- Splunk version:
+- Others:

data/.github/ISSUE_TEMPLATE/enhancement_request.md

@@ -0,0 +1,14 @@
+---
+name: Enhancement Request
+about: Suggest an enhancement to the fluent-plugin-k8s-metrics-agg project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<<!-- Please only use this template for submitting enhancement requests -->
+
+**What would you like to be added**:
+
+**Why is this needed**:

data/.github/ISSUE_TEMPLATE/failing_test.md

@@ -0,0 +1,18 @@
+---
+name: Failing Test
+about: Report test failures in fluent-plugin-k8s-metrics-agg
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+<!-- Please only use this template for submitting reports about failing tests -->
+
+**Which test(s) are failing**:
+
+**Since when has it been failing**:
+
+**Reason for failure**:
+
+**Anything else we need to know**:

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,23 @@
+## Proposed changes
+
+Describe the big picture of your changes here to communicate to the maintainers why we should accept this pull request. If it fixes a bug or resolves a feature request, be sure to link to that issue.
+
+## Types of changes
+
+What types of changes does your code introduce?
+_Put an `x` in the boxes that apply_
+
+- [ ] Bugfix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
+
+## Checklist
+
+_Put an `x` in the boxes that apply._
+
+- [ ] I have read the [CONTRIBUTING](https://github.com/splunk/fluent-plugin-k8s-metrics-agg/blob/develop/CONTRIBUTING.md) doc
+- [ ] I have read the [CLA](https://github.com/splunk/fluent-plugin-k8s-metrics-agg/blob/develop/CLA.md)
+- [ ] I have added tests that prove my fix is effective or that my feature works
+- [ ] I have added necessary documentation (if appropriate)
+- [ ] Any dependent changes have been merged and published in downstream modules
+

data/.gitignore

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

data/CLA.md

@@ -0,0 +1,18 @@
+By submitting a Contribution to this Work, You agree that Your Contribution is made subject to the primary LICENSE 
+file applicable to this Work.  In addition, You represent that: (i) You are the copyright owner of the Contribution 
+or (ii) You have the requisite rights to make the Contribution.
+
+Definitions:
+
+“You” shall mean: (i) yourself if you are making a Contribution on your own behalf; or (ii) your company, 
+if you are making a Contribution on behalf of your company.  If you are making a Contribution on behalf of your 
+company, you represent that you have the requisite authority to do so.    
+ 
+"Contribution" shall mean any original work of authorship, including any modifications or additions to an existing 
+work, that is intentionally submitted by You for inclusion in, or documentation of, this project/repository.  For the 
+purposes of this definition, "submitted" means any form of electronic, verbal, or written communication submitted for 
+inclusion in this project/repository, including but not limited to communication on electronic mailing lists, source 
+code control systems, and issue tracking systems that are managed by, or on behalf of, the maintainers of 
+the project/repository. 
+
+“Work” shall mean the collective software, content, and documentation in this project/repository.

data/Gemfile.lock

@@ -1,67 +1,75 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-k8s-metrics-agg (1.1.0)
-      fluentd (~> 1.3.3)
-      kubeclient (~> 4.2.2)
-      multi_json (~> 1.13.1)
-      oj (~> 3.7.8)
+    fluent-plugin-k8s-metrics-agg (1.1.5)
+      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.3)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    dig_rb (1.0.1)
-    docile (1.3.1)
-    domain_name (0.5.20180417)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    concurrent-ruby (1.1.8)
+    cool.io (1.7.1)
+    crack (0.4.5)
+      rexml
+    docile (1.3.5)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    fluentd (1.3.3)
+    ffi (1.14.2)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    fluentd (1.12.1)
+      bundler
       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)
-      serverengine (>= 2.0.4, < 3.0.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)
+      tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
       yajl-ruby (~> 1.0)
-    hashdiff (0.3.8)
-    http (3.3.0)
+    hashdiff (1.0.1)
+    http (4.4.1)
       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.3.0)
+    http-parser (1.2.3)
+      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.5.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.2.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    msgpack (1.2.6)
-    multi_json (1.13.1)
+    mime-types-data (3.2021.0225)
+    msgpack (1.4.2)
+    multi_json (1.14.1)
     netrc (0.11.0)
-    oj (3.7.9)
-    power_assert (1.1.3)
-    public_suffix (3.0.3)
-    rake (12.3.2)
-    recursive-open-struct (1.1.0)
-    rest-client (2.0.2)
+    oj (3.10.18)
+    power_assert (2.0.0)
+    public_suffix (4.0.6)
+    rake (13.0.3)
+    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)
-    safe_yaml (1.0.4)
-    serverengine (2.1.0)
+    rexml (3.2.4)
+    serverengine (2.2.3)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
     simplecov (0.16.1)
@@ -69,17 +77,16 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    strptime (0.2.3)
-    test-unit (3.3.0)
+    strptime (0.2.5)
+    test-unit (3.3.9)
       power_assert
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2018.9)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2021.1)
       tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.7)
     webmock (3.5.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -90,12 +97,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0.1)
+  bundler (~> 2.0)
   fluent-plugin-k8s-metrics-agg!
-  rake (~> 12.3.2)
+  rake (~> 13.0)
   simplecov (~> 0.16.1)
   test-unit (~> 3.3.0)
   webmock (~> 3.5.1)
 
 BUNDLED WITH
-   2.0.1
+   2.2.7

data/Makefile

@@ -0,0 +1,35 @@
+VERSION := $(shell sh -c 'cat VERSION')
+NODEJS_VERSION := 14.15.1
+
+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) --build-arg NODEJS_VERSION=$(NODEJS_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
+	@mkdir -p docker/gem
+	@rm -rf docker/gem
+	@gem unpack docker/fluent-plugin-*.gem --target docker/gem
+	@cd docker && bundle install