fluent-plugin-splunkhec 2.0 → 2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '058b51ece316507dd70cc84bd3ec0c32372e1f8a'
-  data.tar.gz: bff476df06f9a86433c9b10f74975a5b3d69c301
+SHA256:
+  metadata.gz: e5e45e4cade0cf42639a07c021930e01ead711a2159e81300f5ebc52b2dfbbb3
+  data.tar.gz: 1475b7662149dc73fdba635b49e6bf176ffcbb80ab0bf63b06d4b4d7e241267c
 SHA512:
-  metadata.gz: ced5a57eeb88c6c9ea26bc57db6392f25abde00c89f85539b2a5fad3533972816ba35a4d90b22b3dde14b3b391b10a07ff0ae02782de5c783c5dccd092c74a79
-  data.tar.gz: 150458e3fa0c0b39cab8cc9f4c84bf231f45e70cdbe7344a9d610450066595d16ccdaecaa0dc74e133edcdf17a0d65a915458ce5adc2f4d3265154f187aa1599
+  metadata.gz: ba491c998cb7ef304d478b3e15867c484f76dce5ec7def75e65914b1181acd65a159a0b3f18dea90c2f9c8ef925dfd40798310591264125cd048d4a6f4583606
+  data.tar.gz: 4636433b7d37a0c71375ea68612b8cfe2c85f95096ad9567208847e45376d61ffd5e4675b4a7d33ead99786079071b1d7b551ed330fa680ad24f10dde06fc99e

data/.github/workflows/ruby.yml

@@ -0,0 +1,35 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+    # uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake

data/.gitignore

@@ -0,0 +1,87 @@
+
+# Created by https://www.gitignore.io/api/ruby,macos
+# Edit at https://www.gitignore.io/?templates=ruby,macos
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Ruby ###
+*.gem
+*.rbc
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+# .env
+
+# Ignore Byebug command history file.
+.byebug_history
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+# End of https://www.gitignore.io/api/ruby,macos

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 2.3
+
+Updated dependencies to solve security issues
+
+## 2.2
+
+Replaced deprecated packet statement
+
+## 2.1
+
+Replaced yajl/json_ge for regular yajl
+
 ## 2.0
 
 Migrate to use FluentD v1 API. It doesn't support backwards compatibility.

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in fluent-plugin-googleanalytics.gemspec
+# Specify your gem's dependencies in fluent-plugin-splunkhec.gemspec
 gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Coen Meerbeek
+Copyright (c) 2022 Coen Meerbeek
 
 MIT License
 

data/README.md

@@ -86,4 +86,4 @@ Specify that all events in a FluentD chunk should be sent in batch to Splunk. De
  
 ## Copyright
 
-Copyright (c) 2018 Coen Meerbeek. See [LICENSE](LICENSE) for details.
+Copyright (c) 2021 [LICENSE](LICENSE) for details.

data/fluent-plugin-splunkhec.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "fluent-plugin-splunkhec"
-  gem.version       = "2.0"
+  gem.version       = "2.3"
   gem.authors       = "Coen Meerbeek"
   gem.email         = "cmeerbeek@gmail.com"
   gem.description   = %q{Output plugin for the Splunk HTTP Event Collector.}
@@ -16,10 +16,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "fluentd", [">= 0.14.15", "< 2"]
-  gem.add_dependency "yajl-ruby", '>= 1.3.0'
-  gem.add_development_dependency "rake", '~> 0.9', '>= 0.9.2'
-  gem.add_development_dependency "test-unit", '~> 3.1', '>= 3.1.0'
-  gem.add_development_dependency "webmock", '>= 3.0'
+  gem.add_dependency "fluentd", [">= 1.15.1", "< 2"]
+  gem.add_dependency "yajl-ruby", '>= 1.4.3'
+  gem.add_development_dependency "rake", '>= 13.0.6'
+  gem.add_development_dependency "test-unit", '~> 3.5', '>= 3.5.3'
+  gem.add_development_dependency "webmock", '>= 3.14.0'
   gem.license = 'MIT'
 end

data/lib/fluent/plugin/out_splunkhec.rb

@@ -1,6 +1,6 @@
 require 'fluent/plugin/output'
 require 'net/http'
-require 'yajl/json_gem'
+require 'yajl'
 
 module Fluent::Plugin
   class SplunkHECOutput < Output
@@ -45,7 +45,7 @@ module Fluent::Plugin
           @event_host = 'unknown'
         end
       end
-      @packer = Fluent::Engine.msgpack_factory.packer
+      @packer = Fluent::MessagePackFactory.engine_factory.packer
     end
 
     def start
@@ -123,9 +123,9 @@ module Fluent::Plugin
           event = record.to_s
         when Hash
           if @send_event_as_json
-            event = record.to_json
+            event = Yajl::Encoder.encode(record)
           else
-            event = record.to_json.gsub("\"", %q(\\\"))
+            event = Yajl::Encoder.encode(record).gsub("\"", %q(\\\"))
           end
         else
           event = record
@@ -135,7 +135,7 @@ module Fluent::Plugin
 
         # Build body for the POST request
         if !@usejson
-          event = record["time"]+ " " + record["message"].to_json.gsub(/^"|"$/,"")
+          event = record["time"]+ " " + Yajl::Encoder.encode(record["message"]).gsub(/^"|"$/,"")
           body << '{"time":"'+ DateTime.parse(record["time"]).strftime("%Q") +'", "event":"' + event + '", "sourcetype" :"' + sourcetype + '", "source" :"' + @source + '", "index" :"' + index + '", "host" : "' + event_host + '"}'
         elsif @send_event_as_json
           body << '{"time" :' + time.to_s + ', "event" :' + event + ', "sourcetype" :"' + sourcetype + '", "source" :"' + source + '", "index" :"' + index + '", "host" : "' + event_host + '"}'
@@ -180,7 +180,7 @@ module Fluent::Plugin
       log.debug "splunkhec: HTTP Response Status Code is #{res.code}"
 
       if res.code.to_i != 200
-        body = JSON.parse(res.body)
+        body = Yajl::Parser.parse(res.body)
         raise SplunkHECOutputError.new(body['text'], body['code'], body['invalid-event-number'], res.code)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-splunkhec
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '2.3'
 platform: ruby
 authors:
 - Coen Meerbeek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2022-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.15
+        version: 1.15.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.15
+        version: 1.15.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -36,74 +36,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.5.3
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.14.0
 description: Output plugin for the Splunk HTTP Event Collector.
 email: cmeerbeek@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
+- ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -133,8 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: This plugin allows you to sent events to the Splunk HTTP Event Collector.