logstash-output-newrelic 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750803d3594bfcf428aa32102cdb23679ae0f91a2efa5dc970e7520b8550fdaa
-  data.tar.gz: 101d475ad8adabc356c8041f8ef97481f20aba9041aac4df78e003b524e79196
+  metadata.gz: 998bef6edbc8fb754b22ab4cca0f25b3e27182e3ac22b5992840ebeab1086764
+  data.tar.gz: 9d2517ffcc0b573a5c2321dea3c4ca8ced58df4563346f93a1925983169c1a6d
 SHA512:
-  metadata.gz: 8b770681904d2286b9cdb63231af2e1dffe6f438308796d4b1171916d39ebd98c4f3b702f924305fab7ec4d8965da6ee1f9c444e012bb20e42e5f057d8076dff
-  data.tar.gz: cab594f0010916cbbaf54403df7d3f431a5999fdac6418ca52ee7730b4981e55700658d5275fcd33055f296ba310e63f32610ab9f1636d6ab1ecea95f239345a
+  metadata.gz: 5ebeed8b92b33be3ff45d7148ff402d0128fb0a29fa8028380a046b32819ea5c76ee2d388386ebc801a0840371ccc991a2253c7cf5806d8bc9a0cf050420f0d6
+  data.tar.gz: '02922a85561259f830f3c142dbabac0bb59867e8bf1b87c2fc0810304c51f0d9333251768e32715014c0d1c60bc071ad0b5f0f142bf5dbab54677b0dc9fea477'

data/DEVELOPER.md

@@ -15,11 +15,11 @@
 * 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
+After updating the New Relic repo with changes, changes will need to be pushed to the public GitHub repo at: https://github.com/newrelic/logstash-output-plugin
 
-* `git remote add public git@github.com:newrelic/newrelic-fluent-bit-output.git`
+* `git remote add public git@github.com:newrelic/logstash-output-plugin.git`
 * `git push public master:name-of-branch-to-create`
-* Create a PR from that branch in https://github.com/newrelic/newrelic-fluent-bit-output
+* Create a PR from that branch in https://github.com/newrelic/logstash-output-plugin
 * Get the PR reviewed, merged, and delete the branch!
 
 # Testing it with a local Logstash install

data/lib/logstash/outputs/newrelic.rb

@@ -20,8 +20,6 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
   config :concurrent_requests, :validate => :number, :default => 1
   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
-
   public
 
   def register
@@ -41,10 +39,27 @@ class LogStash::Outputs::NewRelic < LogStash::Outputs::Base
   end
 
   def encode(event_hash)
+    log_message_hash = {
+      'attributes' => {}
+    }
 
-    event_hash.delete('@timestamp')
-    event_hash = maybe_parse_message_json(event_hash)
-    event_hash
+    if event_hash.has_key?('message')
+      log_message_hash['attributes'] = maybe_parse_json(event_hash['message'])
+    end
+
+    event_hash.each do |key, value|
+      if key == 'message' || key == 'timestamp'
+        # intrinsic attributes go at the top level
+        log_message_hash[key] = value
+      elsif key == '@timestamp'
+        # Do not add @timestamp
+      else
+        # non-intrinsic attributes get put into 'attributes'
+        log_message_hash['attributes'][key] = value
+      end
+    end
+    
+    log_message_hash
   end
 
   def maybe_parse_message_json(event_hash)

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

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

data/spec/outputs/newrelic_spec.rb

@@ -83,8 +83,6 @@ describe LogStash::Outputs::NewRelic 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::NewRelicVersion::VERSION })
       .to have_been_made
@@ -111,8 +109,9 @@ describe LogStash::Outputs::NewRelic do
       wait_for(a_request(:post, base_uri)
         .with { |request|
           message = single_gzipped_message(request.body)
+          puts message
           message['message'] == 'Test message' &&
-          message['other'] == 'Other value' })
+          message['attributes']['other'] == 'Other value' })
         .to have_been_made
     end
 
@@ -126,10 +125,10 @@ describe LogStash::Outputs::NewRelic do
       wait_for(a_request(:post, base_uri)
         .with { |request|
           message = single_gzipped_message(request.body)
-          message['in-json-1'] == '1' &&
-          message['in-json-2'] == '2' &&
-          message['sub-object'] == {"in-json-3" => "3"} &&
-          message['other'] == 'Other value' })
+          message['attributes']['in-json-1'] == '1' &&
+          message['attributes']['in-json-2'] == '2' &&
+          message['attributes']['sub-object'] == {"in-json-3" => "3"} &&
+          message['attributes']['other'] == 'Other value' })
         .to have_been_made
     end
 
@@ -144,7 +143,7 @@ describe LogStash::Outputs::NewRelic do
         .with { |request|
           message = single_gzipped_message(request.body)
           message['message'] == message_json_array &&
-          message['other'] == 'Other value' })
+          message['attributes']['other'] == 'Other value' })
         .to have_been_made
     end
 
@@ -159,7 +158,7 @@ describe LogStash::Outputs::NewRelic do
         .with { |request|
           message = single_gzipped_message(request.body)
           message['message'] == message_json_string &&
-          message['other'] == 'Other value' })
+          message['attributes']['other'] == 'Other value' })
         .to have_been_made
     end
 
@@ -174,7 +173,7 @@ describe LogStash::Outputs::NewRelic do
         .with { |request|
           message = single_gzipped_message(request.body)
           message['message'] == 'Test message' &&
-          message['other'] == other_json })
+          message['attributes']['other'] == other_json })
         .to have_been_made
     end
 
@@ -187,7 +186,7 @@ describe LogStash::Outputs::NewRelic do
       wait_for(a_request(:post, base_uri)
       .with { |request|
         message = single_gzipped_message(request.body)
-        message['other'] == 'Other value' })
+        message['attributes']['other'] == 'Other value' })
       .to have_been_made
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-newrelic
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - New Relic Logging Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement