logstash-output-newrelic 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ee56614832b2c9301c8c3b63748c276ee40f5a6a5eb8fd641ed492f1e37c236
-  data.tar.gz: 05d3654fe08c97178690ee79f779249f9b141aa3201b6c8862364ff30f07ae2a
+  metadata.gz: 750803d3594bfcf428aa32102cdb23679ae0f91a2efa5dc970e7520b8550fdaa
+  data.tar.gz: 101d475ad8adabc356c8041f8ef97481f20aba9041aac4df78e003b524e79196
 SHA512:
-  metadata.gz: 74e759723023a155f8b278b19c7e1cf28018854dea57bbd243a6b67758f180011dd7878ae64aff8b68381dd225f352f2e03ca045a14eca724774476c1c90d706
-  data.tar.gz: 5e3c021c98de4960ee1c3782d82a27beaa9d5951e1dfb39039de93d7dd5bfa31c41df8a758152f52a2caa4e3db29212cfa54a9035f6612696fefeadc56ff7912
+  metadata.gz: 8b770681904d2286b9cdb63231af2e1dffe6f438308796d4b1171916d39ebd98c4f3b702f924305fab7ec4d8965da6ee1f9c444e012bb20e42e5f057d8076dff
+  data.tar.gz: cab594f0010916cbbaf54403df7d3f431a5999fdac6418ca52ee7730b4981e55700658d5275fcd33055f296ba310e63f32610ab9f1636d6ab1ecea95f239345a

data/DEVELOPER.md

@@ -12,7 +12,7 @@
 * Write tests and production code!
 * Bump version: edit version file `version.rb`
 * Run tests: `jruby -S bundle exec rspec`
-* Build the gem: `jruby -S gem build logstash-output-newrelic-internal.gemspec`
+* Build the gem: `jruby -S gem build logstash-output-newrelic.gemspec`
 
 ## 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-fluent-bit-output
@@ -24,14 +24,17 @@ After updating the New Relic repo with changes, changes will need to be pushed t
 
 # Testing it with a local Logstash install
 
-* Remove previous version: `logstash-plugin remove logstash-output-newrelic-internal`
-* Add new version: `logstash-plugin install logstash-output-newrelic-internal-<version>.gem `
+Note: you may need to run the following commands outside of your checkout, since these should not
+be run with the JRuby version that you've configured your checkout to use (by using rbenv). 
+
+* Remove previous version: `logstash-plugin remove logstash-output-newrelic`
+* Add new version: `logstash-plugin install logstash-output-newrelic-<version>.gem`
 * Restart logstash: For Homebrew: `brew services restart logstash`
 * Cause a change that you've configured Logstash to pick up (for instance, append to a file you're having it monitor)
 * Look in `https://staging-one.newrelic.com/launcher/logger.log-launcher` for your log message
 
 # Push changes to RubyGems
-After updating the source code and gem version in `version.rb`, push the changes to RubyGems. Note, you must be a gem owner to publish changes on [RubyGems.org](https://rubygems.org/profiles/NR-LOGGING)
+After updating the source code and gem version in `version.rb`, push the changes to RubyGems. There is an older version of the gem that we do not want to overwrite — `version 0.9.1`. Please be sure you are publishing changes to the correct gem i.e. `version 1.0.0` or higher. Note, you must be a gem owner to publish changes on [RubyGems.org](https://rubygems.org/profiles/NR-LOGGING). Once you've created the account, you will need to run `gem signin` to login to RubyGems via the command line.
 
 * Build the gem: `gem build logstash-output-newrelic.gemspec`
-* Publish the gem: `gem push logstash-output-newrelic-logging-<VERSION>.gem` with the updated version (ex: `gem push logstash-output-newrelic-logging-0.2.16.gem`)
+* Publish the gem: `gem push logstash-output-newrelic-<VERSION>.gem` with the updated version (ex: `gem push logstash-output-newrelic-1.0.0.gem`)

data/README.md

@@ -4,7 +4,15 @@ This is a plugin for [Logstash](https://github.com/elastic/logstash) that output
 
 ## Installation
 Install the New Relic Logstash plugin using the following command:</br>
-`logstash-plugin install logstash-output-newrelic-logging`
+`logstash-plugin install logstash-output-newrelic`
+
+(Optional) If you are interested in installing the gem directly, run the following command. If you want a specific version, specify it by appending the `-v <VERSION>` option.<br/>
+`gem install logstash-output-newrelic`
+
+```
+Old version: 0.9.1 (unmaintained)
+Current: 1.0.0
+```
 
 ## Configuration
 
@@ -17,7 +25,7 @@ Get your API Insert Key:
 Example:
 ```rb
 output {
-  newrelic_internal {
+  newrelic {
     api_key => "<API_INSERT_KEY>"
   }
 }

data/lib/logstash/outputs/{newrelic_internal.rb → newrelic.rb}

@@ -1,24 +1,24 @@
 # encoding: utf-8
 require "logstash/outputs/base"
-require "logstash/outputs/newrelic_internal_version/version"
+require "logstash/outputs/newrelic_version/version"
 require 'net/http'
 require 'uri'
 require 'zlib'
 require 'json'
 require 'java'
 
-class LogStash::Outputs::NewRelicInternal < LogStash::Outputs::Base
+class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
   java_import java.util.concurrent.Executors;
   java_import java.util.concurrent.Semaphore;
 
-  config_name "newrelic_internal"
+  config_name "newrelic"
 
   config :api_key, :validate => :password, :required => true
   config :retry_seconds, :validate => :number, :default => 5
   config :max_delay, :validate => :number, :default => 30
   config :retries, :validate => :number, :default => 5
   config :concurrent_requests, :validate => :number, :default => 1
-  config :base_uri, :validate => :string, :default => "https://insights-collector.newrelic.com/logs/v1"
+  config :base_uri, :validate => :string, :default => "https://log-api.newrelic.com/log/v1"
 
   # TODO: do we need to define "concurrency"? https://www.elastic.co/guide/en/logstash/current/_how_to_write_a_logstash_output_plugin.html
 
@@ -72,15 +72,15 @@ class LogStash::Outputs::NewRelicInternal < LogStash::Outputs::Base
       payload.push(encode(event.to_hash))
     end
     payload = {
-      'logs' => payload,
       'common' => {
         'attributes' => {
           'plugin' =>  {
             'type' => 'logstash',
-            'version' => LogStash::Outputs::NewRelicInternalVersion::VERSION,
+            'version' => LogStash::Outputs::NewRelicVersion::VERSION,
           }
         }
-      }
+      },
+      'logs' => payload
     }
     @semaphor.acquire()
     execute = @executor.java_method :submit, [java.lang.Runnable]
@@ -123,4 +123,4 @@ class LogStash::Outputs::NewRelicInternal < LogStash::Outputs::Base
     request.body = payload
     http.request(request)
   end
-end # class LogStash::Outputs::NewRelicInternal
+end # class LogStash::Outputs::NewRelic

data/lib/logstash/outputs/newrelic_version/version.rb

@@ -0,0 +1,7 @@
+module LogStash
+  module Outputs
+    module NewRelicVersion
+      VERSION = "1.0.1"
+    end
+  end
+end

data/logstash-output-newrelic.gemspec

@@ -1,15 +1,14 @@
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
 
-require 'logstash/outputs/newrelic_internal_version/version'
+require 'logstash/outputs/newrelic_version/version'
 
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-newrelic'
-  s.version       = LogStash::Outputs::NewRelicInternalVersion::VERSION
+  s.version       = LogStash::Outputs::NewRelicVersion::VERSION
   s.licenses      = ['Apache-2.0']
-  s.summary       = 'Forwards logs as custom events to insights'
-  s.description   = 'Gzips and decorates logstash events to be properly formatted as custom events'
-  s.homepage      = 'https://source.datanerd.us/logging/logstash-output-newrelic'
+  s.summary       = "Sends Lostash events to New Relic"
+  s.homepage      = 'https://github.com/newrelic/logstash-output-plugin'
   s.authors       = ['New Relic Logging Team']
   s.email         = 'logging-team@newrelic.com'
   s.require_paths = ['lib']

data/spec/outputs/{newrelic_internal_spec.rb → newrelic_spec.rb}

@@ -1,13 +1,13 @@
 # encoding: utf-8
 require "logstash/devutils/rspec/spec_helper"
-require "logstash/outputs/newrelic_internal"
-require "logstash/outputs/newrelic_internal_version/version"
+require "logstash/outputs/newrelic"
+require "logstash/outputs/newrelic_version/version"
 require "logstash/codecs/plain"
 require "logstash/event"
 require "webmock/rspec"
 require "zlib"
 
-describe LogStash::Outputs::NewRelicInternal do
+describe LogStash::Outputs::NewRelic do
   let (:api_key) { "someAccountKey" }
   let (:base_uri) { "https://testing-example-collector.com" }
   let (:retry_seconds) { 0 }
@@ -40,7 +40,7 @@ describe LogStash::Outputs::NewRelicInternal do
   end
 
   before(:each) do
-    @newrelic_output = LogStash::Plugin.lookup("output", "newrelic_internal").new(simple_config)
+    @newrelic_output = LogStash::Plugin.lookup("output", "newrelic").new(simple_config)
     @newrelic_output.register
   end
 
@@ -53,7 +53,7 @@ describe LogStash::Outputs::NewRelicInternal do
       no_api_key_config = {
       }
 
-      expect { LogStash::Plugin.lookup("output", "newrelic_internal").new(no_api_key_config) }.to raise_error LogStash::ConfigurationError
+      expect { LogStash::Plugin.lookup("output", "newrelic").new(no_api_key_config) }.to raise_error LogStash::ConfigurationError
     end
   end
 
@@ -83,8 +83,10 @@ describe LogStash::Outputs::NewRelicInternal do
       wait_for(a_request(:post, base_uri)
       .with { |request|
         data = multiple_gzipped_messages(request.body)[0]
+        data.keys[0] == 'common' &&
+        data.keys[1] == 'logs' &&
         data['common']['attributes']['plugin']['type'] == 'logstash' &&
-        data['common']['attributes']['plugin']['version'] == LogStash::Outputs::NewRelicInternalVersion::VERSION })
+        data['common']['attributes']['plugin']['version'] == LogStash::Outputs::NewRelicVersion::VERSION })
       .to have_been_made
     end
 
@@ -217,7 +219,7 @@ describe LogStash::Outputs::NewRelicInternal do
       # Create a new plugin with this specific config that has longer retry sleep
       # configuration than we normally want
       @newrelic_output&.shutdown
-      @newrelic_output = LogStash::Plugin.lookup("output", "newrelic_internal").new(specific_config)
+      @newrelic_output = LogStash::Plugin.lookup("output", "newrelic").new(specific_config)
       @newrelic_output.register
 
       expect(@newrelic_output.sleep_duration(0)).to equal(5)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-newrelic
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - New Relic Logging Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-25 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -80,8 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Gzips and decorates logstash events to be properly formatted as custom
-  events
+description:
 email: logging-team@newrelic.com
 executables: []
 extensions: []
@@ -93,11 +92,11 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- lib/logstash/outputs/newrelic_internal.rb
-- lib/logstash/outputs/newrelic_internal_version/version.rb
+- lib/logstash/outputs/newrelic.rb
+- lib/logstash/outputs/newrelic_version/version.rb
 - logstash-output-newrelic.gemspec
-- spec/outputs/newrelic_internal_spec.rb
-homepage: https://source.datanerd.us/logging/logstash-output-newrelic
+- spec/outputs/newrelic_spec.rb
+homepage: https://github.com/newrelic/logstash-output-plugin
 licenses:
 - Apache-2.0
 metadata:
@@ -122,6 +121,6 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
-summary: Forwards logs as custom events to insights
+summary: Sends Lostash events to New Relic
 test_files:
-- spec/outputs/newrelic_internal_spec.rb
+- spec/outputs/newrelic_spec.rb

data/lib/logstash/outputs/newrelic_internal_version/version.rb

@@ -1,7 +0,0 @@
-module LogStash
-  module Outputs
-    module NewRelicInternalVersion
-      VERSION = "1.0.0"
-    end
-  end
-end