fluent-plugin-scalyr 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5ac72839e06e113005e9ccfec07a42a64cf5827332069f71527129c4ed4c2a5f
-  data.tar.gz: 3046073c8ef859baf26c72b7d8a3d55b8fdb31f8c38802d0ea4ff46deae6f678
+SHA1:
+  metadata.gz: 891497d6c594d6e115191cae7b8d9d48c428770d
+  data.tar.gz: e1f90aac40a8ed67aaa103ec552924eddf09d54c
 SHA512:
-  metadata.gz: 50fedb702fa6c2f81db78c53f030abb4e94a31140bb9dbd14cd7ebf773b46fa5e0b602207565ae7a4b143d8eed6494b0e7289e2c297a2f6ce192c96bb45ae448
-  data.tar.gz: a6f8470c6e4537b82c77a6d03ee89561d4e1a64c2c0f1689834f36d42f22cacf01fd6ea15d1e33cd2e87ea43665f3bf1191f53c54b6164068bee188dfc5e8686
+  metadata.gz: c1be90d4ae35f8e434269493d19321e27108cf3a608d3874ad4a08d151f69706479f304688630669c8ad79b9785b628a0bf7f4764e955e7e0e7a4bdcc486684b
+  data.tar.gz: 29ca4a9a59d7e1047fd675a6baaaa9a37c45379e48587e586c929db78ea6b1c9323055db7f9c33792765a36cf58a02329286e3cf7ed35ea1a515a0a437d15a01

data/README.md

@@ -66,6 +66,7 @@ The following configuration options are also supported:
 
   #scalyr specific options
   api_write_token YOUR_SCALYR_WRITE_TOKEN
+  compression_type bz2
   server_attributes {
     "serverHost": "front-1",
     "serverType": "frontend",
@@ -99,6 +100,8 @@ The following configuration options are also supported:
 
 ####Scalyr specific options
 
+***compression_type*** - compress Scalyr traffic to reduce network traffic. Options are `bz2` and `deflate`. See [here](https://www.scalyr.com/help/scalyr-agent#compressing) for more details.  This feature is optional.
+
 ***api_write_token*** - your Scalyr write logs token. See [here](http://www.scalyr.com/keys) for more details.  This value **must** be specified.
 
 ***server_attributes*** - a JSON hash containing custom server attributes you want to include with each log request.  This value is optional and defaults to *nil*.

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.8.5

data/fluent-plugin-scalyr.gemspec

@@ -16,6 +16,9 @@ Gem::Specification.new do |gem|
   gem.executables = Dir.glob("bin/*").map{ |f| File.basename(f) }
   gem.require_paths = ['lib']
   gem.add_dependency "fluentd", [">= 0.14.0", "< 2"]
+  gem.add_dependency "ffi", "1.9.25"
+  gem.add_dependency "rbzip2", "0.3.0"
+  gem.add_dependency "zlib"
   gem.add_development_dependency "rake", "~> 0.9"
   gem.add_development_dependency "test-unit", "~> 3.0"
   gem.add_development_dependency "flexmock", "~> 1.2"

data/fluent.conf.sample

@@ -1,6 +1,7 @@
 <match scalyr.*>
   @type scalyr
   api_write_token YOUR_WRITE_LOGS_API_TOKEN
+  compression_type bz2
 
   ##Scalyr specific options
   # server_attributes {

data/lib/fluent/plugin/out_scalyr.rb

@@ -22,6 +22,9 @@ require 'fluent/plugin_helper/compat_parameters'
 require 'json'
 require 'net/http'
 require 'net/https'
+require 'rbzip2'
+require 'stringio'
+require 'zlib'
 require 'securerandom'
 require 'thread'
 
@@ -41,6 +44,8 @@ module Scalyr
     config_param :max_request_buffer, :integer, :default => 1024*1024
     config_param :force_message_encoding, :string, :default => nil
     config_param :replace_invalid_utf8, :bool, :default => false
+    config_param :compression_type, :string, :default => nil #Valid options are bz2, deflate or None. Defaults to None.
+    config_param :compression_level, :integer, :default => 9 #An int containing the compression level of compression to use, from 1-9. Defaults to 9 (max)
 
     config_section :buffer do
       config_set_default :retry_max_times, 40 #try a maximum of 40 times before discarding
@@ -219,9 +224,30 @@ module Scalyr
         https.verify_depth = @ssl_verify_depth
       end
 
+      #use compression if enabled
+      encoding = nil
+
+      if @compression_type
+        if @compression_type == 'deflate'
+          encoding = 'deflate'
+          body = Zlib::Deflate.deflate(body, @compression_level)
+        elsif @compression_type == 'bz2'
+          encoding = 'bz2'
+          io = StringIO.new
+          bz2 = RBzip2.default_adapter::Compressor.new io
+          bz2.write body
+          bz2.close
+          body = io.string
+        end
+      end
+
       post = Net::HTTP::Post.new uri.path
       post.add_field( 'Content-Type', 'application/json' )
 
+      if @compression_type
+        post.add_field( 'Content-Encoding', encoding )
+      end
+
       post.body = body
 
       https.request( post )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-scalyr
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Imron Alston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 2018-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -30,6 +30,48 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.25
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.25
+- !ruby/object:Gem::Dependency
+  name: rbzip2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: zlib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -127,13 +169,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Scalyr plugin for fluentd
 test_files:
-- test/helper.rb
-- test/test_config.rb
 - test/test_events.rb
+- test/test_config.rb
+- test/helper.rb
 - test/test_handle_response.rb
 - test/test_ssl_verify.rb