fluent-plugin-newrelic 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd81b1178e9c16c6d1a9814e456b13936132c96a70c32248f7da5947255875e0
-  data.tar.gz: ebc969b9fbb9bc02f8053e7e039f9d748dba44ab7c29fc4d4b9d96dba378a19d
+  metadata.gz: 6dbed0d5014d5685b57429081cbdc0dc5198f0ecccfe0dc523571efa6ea50ad5
+  data.tar.gz: f98c59dca5ccdb35c0c3cf0032864177da7ae34342b9e2471d68f6b54a7f6bbf
 SHA512:
-  metadata.gz: '0498345d651300e2e75bf44fe0c183fc6b861d29688125aa97d1129a1ae4f1798a1bcac00bd29278e163f7c3d46771fa547ee14768bad0e6f3a39ecc0f9fe23d'
-  data.tar.gz: 8d9830136f2bd34c54820a07ab86bfc7fb40150357501e1ad4854bf037e206fbacee8aff7401cddcd451b3fdcf809ff0fb690dac5d91e43e5d2d7f71fa002c24
+  metadata.gz: 88d7afb9aabd9ab5552bc48fe3aaa06f6dced0dc62e7178c5abefb4bd36e9cd147b9395a582da1f7eec864c5991ca44eb4fc55391db35d447d3e11aa36cd2ad0
+  data.tar.gz: efcdfef5a81b079e4badf992a6976874142e951ef70e26a872a86b01392f2cbca913ac8ed6117d3519d3d8d078e000d27465e6ddd72846654112bf1799a803c1

data/DEVELOPER.md

@@ -25,7 +25,6 @@ td-agent is unloaded. Super weird, but now you know.
 <match **>
   @type newrelic
   api_key (your-api-key)
-  base_uri https://staging-insights-collector.newrelic.com/logs/v1
 </match>
 
 <source>
@@ -43,15 +42,16 @@ td-agent is unloaded. Super weird, but now you know.
 * Start Fluentd: `sudo launchctl load /Library/LaunchDaemons/td-agent.plist`
 * Make sure things start up OK: `tail -f /var/log/td-agent/td-agent.log`
 * Cause a change that you've configured Fluentd to pick up: (`echo "FluentdTest" >> /usr/local/var/log/test.log`
-* Look in `https://staging-one.newrelic.com/launcher/logger.log-launcher` for your log message ("FluentdTest")
+* Look in `https://one.newrelic.com/launcher/logger.log-launcher` for your log message ("FluentdTest")
 
 ## Pushing changes to the public repo
+
 After updating the New Relic repo with changes, changes will need to be pushed to the public GitHub repo 
 at: https://github.com/newrelic/newrelic-fluentd-output
 
 Make sure you have the public set up as a remote called `public`:
 ```
-git remote add public git@github.com:newrelic/logstash-output-plugin.git
+git remote add public git@github.com:newrelic/newrelic-fluentd-output.git
 ```
 
 Sync:

data/README.md

@@ -31,12 +31,12 @@ For more info, review [Fluentd's official documentation](https://docs.fluentd.or
 
 | Property | Description | Default value |
 |---|---|---|
-| concurrent_requests | The number of threads to make requests from | 1 |
-| retries | The maximum number of times to retry a failed request, exponentially increasing delay between each retry | 5 |
-| retry_seconds | The initial delay between retries, in seconds | 5 |
-| max_delay | The maximum delay between retries, in seconds | 30 |
 | base_uri | New Relic ingestion endpoint | 'https://log-api.newrelic.com/log/v1' |
 
+### EU plugin configuration
+
+If you are running this plugin in the eu set the `base_uri` to `http://log-api.eu.newrelic.com/log/v1`.
+
 ### Fields
 
 * To make Kubernetes log forwarding easier, any `log` field in a log event will be

data/lib/fluent/plugin/out_newrelic.rb

@@ -27,12 +27,9 @@ module Fluent
       Fluent::Plugin.register_output('newrelic', self)
       helpers :thread
 
-      config_param :api_key, :string
+      config_param :api_key, :string, :default => nil
       config_param :base_uri, :string, :default => "https://log-api.newrelic.com/log/v1"
-      config_param :retry_seconds, :integer, :default => 5
-      config_param :max_delay, :integer, :default => 30
-      config_param :retries, :integer, :default => 5
-      config_param :concurrent_requests, :integer, :default => 1
+      config_param :license_key, :string, :default => nil
 
       DEFAULT_BUFFER_TYPE = 'memory'.freeze
 
@@ -51,14 +48,21 @@ module Fluent
 
       def configure(conf)
         super
+        if @api_key.nil? && @license_key.nil?
+          raise Fluent::ConfigError.new("'api_key' or `license_key` parameter is required") 
+        end
 
         # 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? ? @license_key : @api_key 
+        }
         @header = {
-            'X-Insert-Key' => @api_key,
             'X-Event-Source' => 'logs',
             'Content-Encoding' => 'gzip'
-        }.freeze
+        }.merge(auth)
+        .freeze
       end
 
       def package_record(record, timestamp)
@@ -106,35 +110,13 @@ module Fluent
         gzip = Zlib::GzipWriter.new(io)
         gzip << [payload].to_json
         gzip.close
-        attempt_send(io.string, 0)
-      end
-
-      def should_retry?(attempt)
-        attempt < @retries
+        send(io.string)
       end
-
-      def was_successful?(response)
-        200 <= response.code.to_i && response.code.to_i < 300
-      end
-
-      def sleep_duration(attempt)
-        if attempt == 0
-          return 0
+      
+      def handle_response(response)
+        if !(200 <= response.code.to_i && response.code.to_i < 300)
+          log.error("Response was " + response.code + " " + response.body)
         end
-
-        [@max_delay, (2 ** (attempt - 1)) * @retry_seconds].min
-      end
-
-      def sleep_on_retry(attempt)
-        duration = sleep_duration(attempt)
-        if duration > 0
-          sleep duration
-        end
-      end
-
-      def attempt_send(payload, attempt)
-        sleep_on_retry(attempt)
-        attempt_send(payload, attempt + 1) unless was_successful?(send(payload)) if should_retry?(attempt)
       end
 
       def send(payload)
@@ -143,7 +125,7 @@ module Fluent
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
         request = Net::HTTP::Post.new(@end_point.request_uri, @header)
         request.body = payload
-        http.request(request)
+        handle_response(http.request(request))
       end
 
     end

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

@@ -1,3 +1,3 @@
 module NewrelicFluentdOutput
-  VERSION = "1.0.1"
+  VERSION = "1.1.1"
 end

metadata

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