fluent-plugin-newrelic 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ee73ce175fb282dc265d9fb7f6e7fd77070e34239a62296c66317dcb8ab1ffc
-  data.tar.gz: 9c68570a7caf8dd62385f0d7077fc21009d8e37436d340a1b47469071d1ff884
+  metadata.gz: 8cb4af63cf04a60335e50efdc0861bb8207a8486abf19c119f19622c0d36f523
+  data.tar.gz: c64ccd499c958400b1be3459c7ec9c864515baa7155839f817a6627e5bef14a5
 SHA512:
-  metadata.gz: 854481935c1b820b9c59faaed047d9d1aec1ed28cf39c4dc38271bcc9ad1028c61e1aa6b56e1ee6de35e1ac995a45254ebec92298a56f4312068bd667248a40a
-  data.tar.gz: 90c99413df6d425e7d6339abfe6615ee168368d0729722957ca05e779c2459542f2b0c01cec4a9acc3aa424ff2a07026316033594aec71bfa3a404b32da82c9c
+  metadata.gz: da6b7569f2f5555c902673beff340926993167cb68b8f11f6154c80fe48a82158ff7eb41c86828517ee56f1957417822ad25a8203ef18e9a9c4b4121222f93cd
+  data.tar.gz: e7bbc86ca57b5c20df3e81c7ff61750b0a8e0cad1424ec22ca1cab875de2159fabb8becb768600b7959cab7cd48a4c69a51af4ba3204fc79ae656932dfac4ead

data/.gitignore

@@ -10,3 +10,4 @@
 .DS_Store
 .ruby-version
 .idea/
+*.gem

data/DEVELOPER.md

@@ -1,14 +1,5 @@
 # Developing the plugin
 
-## Set up
-
-As of September 2019, some supported versions of Fluentd uses Ruby 2.1.10p492, so you'll want to use that to 
-develop and test with.
-
-* Install rbenv
-* Install an old version of Ruby: `rbenv install 2.1.0`
-* Use that older version: `rbenv local 2.1.0`
-
 ## Developing
 
 * Install Bundler gem: `gem install bundler`
@@ -18,9 +9,10 @@ develop and test with.
 * Run tests: `bundle exec rspec`
 * Build the gem: `gem build newrelic-fluentd-output.gemspec`
 
-**NOTE**: Be mindful that using `log.info` in the plugin causes an unintended Sorcerer's 
-Apprentice Syndrome style bug where exponentially larger copies of log messages are sent until the 
-td-agent is unloaded. Super weird, but now you know.
+**NOTE**: Be mindful that if you are using 'match **', that using `log.info` in the plugin can cause an unintended 
+Sorcerer's Apprentice Syndrome issue where exponentially larger copies of log messages are sent until the 
+td-agent is unloaded. To prevent this, use match tags specific to your source (so use `<match tag_from_your_source>`
+instead of `<match **>`), so that your output plugin does not also pick up things that Fluentd logs.
 
 ## Testing on MacOS
 
@@ -31,17 +23,17 @@ td-agent is unloaded. Super weird, but now you know.
 * `sudo vi /etc/td-agent/td-agent.conf`
 * Add the following:
 ```
-<match **>
-  @type newrelic
-  api_key (your-api-key)
-</match>
-
 <source>
   @type tail
   format none
   path /usr/local/var/log/test.log
   tag test
 </source>
+
+<match test>
+  @type newrelic
+  api_key (your-api-key)
+</match>
 ```
 
 ### Testing plugin

data/README.md

@@ -23,9 +23,12 @@ For more info, review [Fluentd's official documentation](https://docs.fluentd.or
 
 ### Required plugin configuration
 
+Exactly one of the following:
+
 | Property | Description |
 |---|---|
 | api_key | your New Relic API Insert key |
+| license_key | your New Relic License key |
 
 ### Optional plugin configuration
 
@@ -45,9 +48,11 @@ in a `log` field, while we want messages in a `message` field.
 
 ### Example
 
-Add the following block to your Fluentd config file (with your specific New Relic Insights Insert key), then restart Fluentd.
+Add one of the following blocks to your Fluentd config file (with your specific key), then restart Fluentd.
+
+#### Using Insights Inserts Key
 
-Example:
+Example using Insights Insert key:
 ```rb
 <match **>
   @type newrelic
@@ -58,6 +63,18 @@ Example:
 Getting your New Relic Insights Insert key:
 `https://insights.newrelic.com/accounts/<ACCOUNT_ID>/manage/api_keys`
 
+#### Using License Key
+Example using License key:
+```rb
+<match **>
+  @type newrelic
+  license_key <NEW_RELIC_LICENSE_KEY>
+</match>
+```
+
+Getting your New Relic license key:
+`https://rpm.newrelic.com/accounts/<ACCOUNT_ID>`
+
 ## Copyright
 
 * Copyright(c) 2019 - New Relic

data/lib/fluent/plugin/out_newrelic.rb

@@ -56,9 +56,10 @@ module Fluent
         # create initial sockets hash and socket based on config param
         @end_point = URI.parse(@base_uri)
         auth = {
-          @api_key.nil? ? 'X-License_key' : 'X-Insert-Key' => 
+          @api_key.nil? ? 'X-License-Key' : 'X-Insert-Key' =>
           @api_key.nil? ? @license_key : @api_key 
         }
+        puts auth
         @header = {
             'X-Event-Source' => 'logs',
             'Content-Encoding' => 'gzip'
@@ -109,6 +110,11 @@ module Fluent
         end
         io = StringIO.new
         gzip = Zlib::GzipWriter.new(io)
+
+        # Fluentd can run with a version of Ruby (2.1.0) whose to_json method doesn't support non-ASCII characters.
+        # So we use Yajl, which can handle all Unicode characters. Apparently this library is what Fluentd uses
+        # internally, so it is installed by default with td-agent.
+        # See https://github.com/fluent/fluentd/issues/215
         gzip << Yajl.dump([payload])
         gzip.close
         send_payload(io.string)
@@ -124,6 +130,7 @@ module Fluent
         http = Net::HTTP.new(@end_point.host, 443)
         http.use_ssl = true
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+        puts @header
         request = Net::HTTP::Post.new(@end_point.request_uri, @header)
         request.body = payload
         handle_response(http.request(request))

data/lib/newrelic-fluentd-output/version.rb

@@ -1,3 +1,3 @@
 module NewrelicFluentdOutput
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-newrelic
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - New Relic Logging Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd