fluent-plugin-out-kivera 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0786fbc8d55e7954af817ef554758dd69ce532db13f6cf448a84beb1cf54fec5'
-  data.tar.gz: 140006b1217e9c98e32f5338ad96160361917d234ba8cf55b7dda891bf8d7388
+  metadata.gz: 721bfd6a1f2d3a7fd4c1b0f32f4c0b9c719f893efceb5e4efc85d120a584cfd0
+  data.tar.gz: 4e5570fb109cc3a10611943feb6d5a969e1bb622e465f265fb64a7f690446199
 SHA512:
-  metadata.gz: '0218466cb92d206906fdfca7491fb0a7485f4df13f08372c36f9f99aec5081e4eca6cccd499eb4341dbae2bec624ffacd5142ab63959d96157a0a07d70448724'
-  data.tar.gz: e0c964d575be14e3d333f541e5f04a727f00d798e38d6b6f6c2909edbe489dc77bd95e007b410698ed7cdc93d82211ab656a416927b5cfb86f7792902cb69975
+  metadata.gz: c12450c146eac19c5a4ad93c981d65b7a37380079a0be5b76f8e26ee80536efaf423d7ac25d79c77cce10151a6da38e7b3595e7ff7801b0fe4bc8e5e66e2129a
+  data.tar.gz: 1b739bbcc134e71c865c0c431b169717e8a287d43f93ef4434e17f9eeb2495e120a9490e0c3d609542ed1beb797ba92816bf7bd8d4224ec698ca4ce0cb457a01

data/.github/workflows/test.yml

@@ -0,0 +1,43 @@
+# name: Test
+# on:
+#   - push
+#   - pull_request
+# jobs:
+#   build:
+#     runs-on: ${{ matrix.os }}
+#     strategy:
+#       fail-fast: false
+#       matrix:
+#         ruby: [ '2.7', '3.0', '3.1' ]
+#         os:
+#           - ubuntu-latest
+#           - macOS-latest
+#     name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
+#     steps:
+#       - uses: actions/checkout@v3
+#       - uses: ruby/setup-ruby@v1
+#         with:
+#           ruby-version: ${{ matrix.ruby }}
+#           bundler-cache: true
+#       - name: unit testing
+#         run: |
+#           bundle exec rake test
+
+#   gem:
+#     name: Gem test
+#     runs-on: ubuntu-latest
+#     steps:
+#       - uses: actions/checkout@v3
+#       - uses: ruby/setup-ruby@v1
+#         with:
+#           ruby-version: 3.1
+#       - name: Install
+#         run: |
+#           rake install
+#           gem install test-unit webrick
+#       - name: Test
+#         run: |
+#           mkdir -p tmp
+#           cd tmp
+#           cp -a ../test/ ./
+#           ../run_test.rb

data/CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+## 1.3.4
+* Add debug log about chunk writing
+* Tweak CI
+
 ## 1.3.3
 * Revert x-ndjson format payload behavior
 

data/Makefile

@@ -0,0 +1,12 @@
+SHELL=/bin/bash
+.ONESHELL:
+.EXPORT_ALL_VARIABLES:
+
+build:
+	@if [ "${VER}" = "" ]; then echo "VER not set"; exit 1; else echo "VER=${VER}"; fi
+	sed -i '' 's/  gem.version.*/  gem.version       = "${VER}"/g' fluent-plugin-out-kivera.gemspec
+	gem build fluent-plugin-out-kivera
+
+push:
+	@if [ "${VER}" = "" ]; then echo "VER not set"; exit 1; else echo "VER=${VER}"; fi
+	gem push fluent-plugin-out-kivera-${VER}.gem

data/README.md

@@ -6,39 +6,43 @@ A generic [fluentd][1] output plugin for sending Kivera proxy logs to the Kivera
 
 You can specify the path to a config.json file which can contain the following parameters:
 
-  *config.json*
-  {
+*config.json*
+```
+{
     "client_id": "",
     "client_secret": "",
     "audience": "",
     "auth0_domain": "",
     "auth0_cert": "",
     "auth0_cert_file": ""
-  }
+}
+```
 
 Note that parameter specified within the config_file will take precendence over parameters specified in your fluent.conf.
 Also note that the auth0_cert parameter will take precedence over the auth0_cert_file parameter.
 
-  *fluent.conf*
-    <match *>
-      @type kivera
-      endpoint_url              http://localhost.local/api/
-      config_file               /path/to/config_file.json
-      client_id                 abc123
-      client_secret             def456
-      audience                  http://api.kivera.io
-      auth0_domain              auth.nonp.kivera.io
-      auth0_cert                -----BEGIN CERTIFICATE-----...
-      auth0_cert_file           /path/to/auth0_cert_file
-      ssl_no_verify             false  # default: false
-      rate_limit_msec           100    # default: 0 = no rate limiting
-      raise_on_error            false  # default: true
-      recoverable_status_codes  503, 400 # default: 503
-      custom_headers            {"token":"arbitrary"} # default: nil
-      buffered                  true   # default: false. Switch non-buffered/buffered mode
-      bulk_request              true  # default: true. Send events as application/x-ndjson
-      compress_request          true  # default: false. Send compressed events
-    </match>
+*fluent.conf*
+```
+<match *>
+    @type kivera
+    endpoint_url              http://localhost.local/api/
+    config_file               /path/to/config_file.json
+    client_id                 abc123
+    client_secret             def456
+    audience                  http://api.kivera.io
+    auth0_domain              auth.nonp.kivera.io
+    auth0_cert                -----BEGIN CERTIFICATE-----...
+    auth0_cert_file           /path/to/auth0_cert_file
+    ssl_no_verify             false  # default: false
+    rate_limit_msec           100    # default: 0 = no rate limiting
+    raise_on_error            false  # default: true
+    recoverable_status_codes  503, 400 # default: 503
+    custom_headers            {"token":"arbitrary"} # default: nil
+    buffered                  true   # default: false. Switch non-buffered/buffered mode
+    bulk_request              true  # default: true. Send events as application/x-ndjson
+    compress_request          true  # default: false. Send compressed events
+</match>
+```
 
 ## Usage notes
 
@@ -56,3 +60,11 @@ Heavily based on [fluent-plugin-out-http][2]
   [1]: http://fluentd.org/
   [2]: https://github.com/fluent-plugins-nursery/fluent-plugin-out-http
   [3]: https://github.com/sabottenda/fluent-plugin-bufferize
+
+## How to release
+
+1. Update `gem.version` of the `gemspec` file.
+1. Update `CHANGELOG.md`.
+1. Commit them.
+1. `$ bundle exec rake release`
+    * It will add and push the tag, and publish the gem.

data/fluent-plugin-out-kivera.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-out-kivera"
-  gem.version       = "1.0.2"
+  gem.version       = "1.0.4"
   gem.authors       = ["Tyler Matheson"]
-  gem.email         = ["support@kivera.io"]
+  gem.email         = ["tyler@kivera.io"]
   gem.summary       = "Fluentd plugin for Kivera"
   gem.description   = "A Fluentd output plugin for sending Kivera proxy logs to the Kivera log ingestion service"
   gem.homepage      = "https://github.com/kivera-io/fluent-plugin-out-kivera"

data/lib/fluent/plugin/out_kivera.rb

@@ -48,6 +48,9 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
   # kivera proxy client secret
   config_param :client_secret, :string, default: ""
 
+  # Kivera proxy entity secret
+  config_param :entity_secret, :string, default: ""
+
   # kivera audience api
   config_param :audience, :string, default: ""
 
@@ -112,11 +115,12 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
     config = conf.elements(name: 'storage').first
     @storage = storage_create(usage: 'jwt_token', conf: config, default_type: 'local')
 
-    if ! @config_file.empty?
+    unless @config_file.empty?
       creds =  File.read(@config_file)
       parsed = Yajl::Parser.new.parse(StringIO.new(creds))
       @client_id = parsed.fetch("client_id", @client_id)
       @client_secret = parsed.fetch("client_secret", @client_secret)
+      @entity_secret = parsed.fetch("entity_secret", @entity_secret)
       @audience = parsed.fetch("audience", @audience)
       @auth0_cert = parsed.fetch("auth0_cert", @auth0_cert)
       @auth0_cert_file = parsed.fetch("auth0_cert", @auth0_cert_file)
@@ -127,17 +131,17 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
       @auth0_cert = File.read(@auth0_cert_file)
     end
 
-    if @client_id.empty? && 
-        @client_secret.empty? && 
-        @audience.empty? && 
-        @auth0_cert.empty? && 
+    if @client_id.empty? &&
+        @client_secret.empty? &&
+        @audience.empty? &&
+        @auth0_cert.empty? &&
         @auth0_domain.empty?
       params = "client_id, client_secret, audience, auth0_cert and auth0_domain"
-      log.error "Missing configuration. Either specify a config_file or set the #{params} parameters"
+      raise Fluent::ConfigError, "Missing configuration. Either specify a config_file or set the #{params} parameters"
     end
 
     if @endpoint_url.empty?
-      @endpoint_url = "https://logs.#{@auth0_domain.delete_prefix("auth.")}"
+      @endpoint_url = "https://#{@auth0_domain.sub("auth", "logs")}"
       log.info "Using logs endpoint #{@endpoint_url}"
     end
 
@@ -207,12 +211,13 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
     url = "https://" + @auth0_domain + "/oauth/token"
     uri = URI.parse(url)
     req = Net::HTTP::Post.new(uri.to_s)
-    payload = { 
+    payload = {
       "client_id" =>      @client_id,
 			"client_secret" =>  @client_secret,
 			"audience" =>       @audience,
       "grant_type" =>     "client_credentials"
     }
+    payload["entity_secret"] = @entity_secret if @entity_secret
     set_json_body(req, payload)
     res = https(uri).request(req)
     case res
@@ -281,8 +286,8 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
   end
 
   def send_request(req, uri)
-    is_rate_limited = (@rate_limit_msec != 0 and not @last_request_time.nil?)
-    if is_rate_limited and ((Time.now.to_f - @last_request_time) * 1000.0 < @rate_limit_msec)
+    is_rate_limited = (@rate_limit_msec != 0 && ! @last_request_time.nil?)
+    if is_rate_limited && ((Time.now.to_f - @last_request_time) * 1000.0 < @rate_limit_msec)
       log.info('Dropped request due to rate limiting')
       return
     end
@@ -308,7 +313,7 @@ class Fluent::Plugin::HTTPOutput < Fluent::Plugin::Output
       log.warn "Net::HTTP.#{req.method.capitalize} raises exception: #{e.class}, '#{e.message}'"
       raise e if @raise_on_error
     else
-       unless res and res.is_a?(Net::HTTPSuccess)
+       unless res && res.is_a?(Net::HTTPSuccess)
           res_summary = if res
                            "#{res.code} #{res.message} #{res.body}"
                         else

data/run_test.rb

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+Dir.glob("test/**/test_*.rb") do |test_rb|
+  require File.expand_path(test_rb)
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-out-kivera
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Tyler Matheson
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -103,30 +102,30 @@ dependencies:
 description: A Fluentd output plugin for sending Kivera proxy logs to the Kivera log
   ingestion service
 email:
-- support@kivera.io
+- tyler@kivera.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/linux.yml"
-- ".github/workflows/macos.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - ISSUE_TEMPLATE.md
 - LICENSE.txt
+- Makefile
 - README.md
 - Rakefile
 - fluent-plugin-out-kivera.gemspec
 - lib/fluent/plugin/out_kivera.rb
 - lib/fluent/test/http_output_test.rb
+- run_test.rb
 - test/plugin/script/plugin/formatter_test.rb
 - test/plugin/test_out_kivera.rb
 homepage: https://github.com/kivera-io/fluent-plugin-out-kivera
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -141,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Fluentd plugin for Kivera
 test_files:

data/.github/workflows/linux.yml

@@ -1,26 +0,0 @@
-name: Testing on Ubuntu
-on:
-  - push
-  - pull_request
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.4', '2.5', '2.6', '2.7' ]
-        os:
-          - ubuntu-latest
-    name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: unit testing
-      env:
-        CI: true
-      run: |
-        gem install bundler rake
-        bundle install --jobs 4 --retry 3
-        bundle exec rake test

data/.github/workflows/macos.yml

@@ -1,26 +0,0 @@
-name: Testing on macOS
-on:
-  - push
-  - pull_request
-jobs:
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.4', '2.5', '2.6', '2.7' ]
-        os:
-          - macOS-latest
-    name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: unit testing
-      env:
-        CI: true
-      run: |
-        gem install bundler rake
-        bundle install --jobs 4 --retry 3
-        bundle exec rake test