fluent-plugin-scalyr 0.8.9 → 0.8.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ed19a4785fee04bde919ac58992fe818f9c768c2
-  data.tar.gz: f25e22d8da36757fdd9bcfe3281ee83311820302
+SHA256:
+  metadata.gz: f9f9a9d2d7c0086b3885e3c3962fcd7271b84b79cbd1dd937cfb27f1d24e16d8
+  data.tar.gz: d99dd0b487a8f4920a2abc53b00fb2f75499647ed6cb75bcd0ffa9a0a0dd0871
 SHA512:
-  metadata.gz: f4c8fd4a61667aef02f4e9ef392d5b96dac935c1cff109d66d611bc783b6944f5bf8ab5d7dd655080da67b5e521c1a3742a69a895791b902843c0b18d485fedd
-  data.tar.gz: b70e0f02e8a91fc0c821ac0568e9c2dafb8fd1f8e20bac9421f892be5cc074a71a93f722d7c9d84cbfe38b781b6ba7814c601a061c99ea0a9a2de34dd69706a8
+  metadata.gz: b6374eb7cb7e4eb1fa3ba3c7342999f176743b07b3293ff3a34f87e127004db50502fb3989117873b68702600fdb6072f4fe39f1f78fef2d280d37a86fa04dc8
+  data.tar.gz: 8964f56c050fa025825ef3bb4c74d7ef593d32eee86930f9bb9847bedd5048a1851767cc1d3d9d67f064dc1b08622b479add48cab6f395519f08e692c2f57154

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gemspec

data/README.md

@@ -1,5 +1,5 @@
 Scalyr output plugin for Fluentd
-=========================
+================================
 
 **Note:** Fluentd introduced breaking changes to their plugin API between
 version 0.12 and 0.14.
@@ -24,28 +24,12 @@ Fluentd may format log messages into json or some other format.  If you want to
   format none
 ```
 
-The Scalyr output plugin assigns a unique Scalyr session id for each Fluentd <match> block.  It is recommended that a single machine doesn't create too many simultaneous Scalyr sessions, so if possible you should try to have a single match for all logs you wish to send to Scalyr.
+The Scalyr output plugin assigns a unique Scalyr session id for each Fluentd <match> block, or for each worker.  It is recommended that a single machine doesn't create too many simultaneous Scalyr sessions, so if possible you should try to have a single match for all logs you wish to send to Scalyr.
 
 This can be done by specifying tags such as scalyr.apache, scalyr.maillog etc and matching on scalyr.\*
 
 Fluentd tag names will be used for the logfile name in Scalyr.
 
-Scalyr Parsers and Custom Fields
---------------------------------
-
-You may also need to specify a Scalyr parser for your log message or add custom fields to each log event. This can be done using Fluentd's filter mechanism, in particular the [record_transformer filter](https://docs.fluentd.org/filter/record_transformer).
-
-For example, if you want to use Scalyr's ```accessLog``` parser for all events with the ```scalyr.access``` tag you would add the following to your fluent.conf file:
-
-```
-<filter scalyr.access>
-  @type record_transformer
-  <record>
-    parser accessLog
-  </record>
-</filter>
-```
-
 Plugin Configuration
 -------------
 
@@ -66,7 +50,8 @@ The following configuration options are also supported:
 
   #scalyr specific options
   api_write_token YOUR_SCALYR_WRITE_TOKEN
-  compression_type bz2
+  compression_type deflate
+  compression_level 6
   use_hostname_for_serverhost true
   server_attributes {
     "serverHost": "front-1",
@@ -79,8 +64,9 @@ The following configuration options are also supported:
   ssl_verify_peer true
   ssl_verify_depth 5
   message_field message
+  parser nil
 
-  max_request_buffer 3000000
+  max_request_buffer 5500000
 
   force_message_encoding nil
   replace_invalid_utf8 false
@@ -99,6 +85,36 @@ The following configuration options are also supported:
 </match>
 ```
 
+For some additional examples of configuration for different setups, please refer to the
+[examples/configs/](https://github.com/scalyr/scalyr-fluentd/tree/master/examples/configs/)
+directory.
+
+Scalyr Parsers and Custom Fields
+--------------------------------
+
+You may also need to specify a Scalyr parser for your log message or add custom fields to each log event. This can be done using Fluentd's filter mechanism, in particular the [record_transformer filter](https://docs.fluentd.org/filter/record_transformer).
+
+For example, if you want to use Scalyr's ```accessLog``` parser for all events with the ```scalyr.access``` tag you would add the following to your fluent.conf file:
+
+```
+<filter scalyr.access>
+  @type record_transformer
+  <record>
+    parser accessLog
+  </record>
+</filter>
+```
+
+Alternatively, if the same parser can be used for all events sent by the Fluentd output plugin, the parser can be set using the ```parser``` plugin configuration. For example, to use Scalyr's ```accessLog``` parser for all events, use the output plugin configuration:
+
+```
+<match scalyr.*>
+  @type scalyr
+  api_write_token YOUR_SCALYR_WRITE_LOGS_TOKEN
+  parser accessLog
+</match>
+```
+
 ### 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.
@@ -111,7 +127,7 @@ The following configuration options are also supported:
 
 ***scalyr_server*** - the Scalyr server to send API requests to. This value is optional and defaults to https://agent.scalyr.com/
 
-***ssl_ca_bundle_path*** - a path on your server pointing to a valid certificate bundle.  This value is optional and defaults to */etc/ssl/certs/ca-bundle.crt*.
+***ssl_ca_bundle_path*** - a path on your server pointing to a valid certificate bundle.  This value is optional and defaults to *nil*, which means it will look for a valid certificate bundle on its own.
 
 **Note:** if the certificate bundle does not contain a certificate chain that verifies the Scalyr SSL certificate then all requests to Scalyr will fail unless ***ssl_verify_peer*** is set to false.  If you suspect logging to Scalyr is failing due to an invalid certificate chain, you can grep through the Fluentd output for warnings that contain the message 'certificate verification failed'.  The full text of such warnings will look something like this:
 
@@ -129,7 +145,9 @@ The cURL project maintains CA certificate bundles automatically converted from m
 
 ***message_field*** - Scalyr expects all log events to have a 'message' field containing the contents of a log message.  If your event has the log message stored in another field, you can specify the field name here, and the plugin will rename that field to 'message' before sending the data to Scalyr.  **Note:** this will override any existing 'message' field if the log record contains both a 'message' field and the field specified by this config option.
 
-***max_request_buffer*** - The maximum size in bytes of each request to send to Scalyr.  Defaults to 3,000,000 (3MB).  Fluentd chunks that generate JSON requests larger than the max_request_buffer will be split in to multiple separate requests.  **Note:** The maximum size the Scalyr servers accept for this value is 6MB and requests containing data larger than this will be rejected.
+***parser*** - The Scalyr parser to use to parse the 'message' field for each event. This value is optional and defaults to *nil*.
+
+***max_request_buffer*** - The maximum size in bytes of each request to send to Scalyr.  Defaults to 5,500,000 (5.5MB).  Fluentd chunks that generate JSON requests larger than the max_request_buffer will be split in to multiple separate requests.  **Note:** The maximum size the Scalyr servers accept for this value is 6MB and requests containing data larger than this will be rejected.
 
 ***force_message_encoding*** - Set a specific encoding for all your log messages (defaults to nil).  If your log messages are not in UTF-8, this can cause problems when converting the message to JSON in order to send to the Scalyr server.  You can avoid these problems by setting an encoding for your log messages so they can be correctly converted.
 
@@ -175,3 +193,22 @@ Which builds the gem and puts it in the pkg directory, then install the Gem usin
 ```
 fluent-gem install pkg/fluent-plugin-scalyr-<VERSION>.gem
 ```
+
+Publishing a new release to RubyGems
+------------------------------------
+
+(for project maintainers)
+
+To publish a new version to RubyGems, simply make your changes, make sure all the lint checks and
+tests pass and merge your changes into master.
+
+After that's done, bump a version in ``VERSION`` file, update ``CHANGELOG.md`` file, add a tag
+which matches a version in VERSION file (e.g. ``v0.8.10``) and push that tag to the remote:
+
+```bash
+git tag v0.8.10
+git push origin v0.8.10
+```
+
+Push of this tag will trigger a Circle CI job which will build the latest version of the gem and
+publish it to RubyGems.

data/Rakefile

@@ -1,11 +1,15 @@
-require 'bundler'
+# frozen_string_literal: true
+
+require "bundler"
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+require "rake/testtask"
 
-Rake::TestTask.new do |t|
-  t.libs << "test" << "lib"
-  t.pattern = 'test/**/test_*.rb'
+Rake::TestTask.new(:test) do |test|
+  test.libs << "lib" << "test"
+  test.test_files = FileList["test/test_*.rb"]
+  test.verbose = true
+  test.options = "--verbose=verbose"
 end
 
-task :default => [:build]
+task default: [:build]

data/VERSION

@@ -1 +1 @@
-0.8.9
+0.8.14

data/fluent-plugin-scalyr.gemspec

@@ -1,4 +1,6 @@
-$:.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 Gem::Specification.new do |gem|
   gem.name = "fluent-plugin-scalyr"
@@ -9,18 +11,19 @@ Gem::Specification.new do |gem|
   gem.authors = ["Imron Alston"]
   gem.licenses = ["Apache-2.0"]
   gem.email = "imron@scalyr.com"
-  gem.has_rdoc = false
   gem.platform = Gem::Platform::RUBY
-  gem.files = Dir['AUTHORS', 'Gemfile', 'LICENSE', 'README.md', 'Rakefile', 'VERSION', 'fluent-plugin-scalyr.gemspec', 'fluent.conf.sample', 'lib/**/*', 'test/**/*']
+  gem.files = Dir["AUTHORS", "Gemfile", "LICENSE", "README.md", "Rakefile", "VERSION",
+                  "fluent-plugin-scalyr.gemspec", "fluent.conf.sample", "lib/**/*", "test/**/*"]
   gem.test_files = Dir.glob("{test,spec,features}/**/*")
-  gem.executables = Dir.glob("bin/*").map{ |f| File.basename(f) }
-  gem.require_paths = ['lib']
-  gem.add_dependency "fluentd", [">= 0.14.0", "< 2"]
+  gem.executables = Dir.glob("bin/*").map {|f| File.basename(f) }
+  gem.require_paths = ["lib"]
   gem.add_dependency "ffi", "1.9.25"
+  gem.add_dependency "fluentd", [">= 0.14.0", "< 2"]
   gem.add_dependency "rbzip2", "0.3.0"
   gem.add_dependency "zlib"
+  gem.add_development_dependency "bundler", "~> 1.9"
+  gem.add_development_dependency "flexmock", "~> 1.2"
   gem.add_development_dependency "rake", "~> 0.9"
+  gem.add_development_dependency "rubocop", "~> 0.4"
   gem.add_development_dependency "test-unit", "~> 3.0"
-  gem.add_development_dependency "flexmock", "~> 1.2"
-  gem.add_development_dependency "bundler", "~> 1.9"
 end

data/fluent.conf.sample

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