logstash-output-rollbar 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ceb5758f3895bbe8f60148fd3ea4e44f39a6a95
-  data.tar.gz: 315224277928bc3828087517bebbf28be8b19034
+  metadata.gz: 3757f2d43517c7d7fb5e81598503772a9165014c
+  data.tar.gz: 9602ce3c72e15a182989ac438d3dd88cf0ce3d01
 SHA512:
-  metadata.gz: a1d34114545efaa27eb2562a7ac0037e97d23355234dcb9ee23c9d9c72aa86df76baefad58e3ce4178305089184b00695d8f44116591e3cedb6ecc210b26b609
-  data.tar.gz: 8f2b33edeb86aa71cf3017722dc03a93055fcd7e82737da23b04fb2c3f4a152a3f48dbac59b396272a9971f74bb84315f33b4deb2cf7233e4092337718078847
+  metadata.gz: ecbe5a8b28b9eb148508cdf8ee8f4388e7d01c090cae8eb66a2c679669f70089991ecf5b9eb9043186f16ec2d09b2506cfda5f94312cd4ccb916e70ec6f3dd20
+  data.tar.gz: 57bcee646d6d1cc86e12b957e536c7192cebe1eb35d87bd89a0c1bada983f21eee0e72769adae8fbaf6834d3fdcb52405b19a5184a65e843fc8bc8683332e16e

data/lib/logstash/outputs/rollbar.rb

@@ -9,19 +9,25 @@ require "json"
 # applications, you can use the same token.
 class LogStash::Outputs::Rollbar < LogStash::Outputs::Base
   config_name "rollbar"
-  milestone 1
 
-  # Your Rollbar access token
+  # Each of these config values can be specified in the plugin configuration section, in which
+  # case they'll apply to all events, or you can override them on an event by event basis.
+  #
+  # Your default Rollbar access token. You can override this for a specific event by adding
+  # a "[rollbar][access_token]" field to that event
   config :access_token, :validate => :password, :required => true
 
-  # The Rollbar environment
+  # The default Rollbar environment. You can override this for a specific event by adding
+  # a "[rollbar][environment]" field to that event
   config :environment, :validate => :string, :default => 'production'
 
-  # The Rollbar event level (info, warning, error)
+  # The default level for Rollbar events (info, warning, error) You can override this for a specific
+  # event by adding a "[rollbar][level]" field to that event
   config :level, :validate => ['debug', 'info', 'warning', 'error', 'critical'] , :default => 'info'
 
-  # Format for the Rollbar "message" or item title. In most cases you'll want to override this
-  # and build up a message with specific fields from the event.
+  # The default format for the Rollbar "message" or item title. In most cases you'll want to override
+  # this and build up a message with specific fields from the event. You can override this for a specific
+  # event by adding a "[rollbar][format]" field to that event.
   config :format, :validate => :string, :default => "%{message}"
 
   # Rollbar API URL endpoint. You shouldn't need to change this.
@@ -50,7 +56,6 @@ class LogStash::Outputs::Rollbar < LogStash::Outputs::Base
     return unless output?(event)
 
     rb_item = hash_recursive
-    rb_item['access_token'] = @access_token.value
 
     # We'll want to remove fields from data without removing them from the original event
     data = JSON.parse(event.to_json)
@@ -59,7 +64,9 @@ class LogStash::Outputs::Rollbar < LogStash::Outputs::Base
     # If logstash has created 'rollbar' fields, we'll use those to populate the item...
     #
     if data['rollbar']
-      merge_keys = %w{platform language framework context request person server client fingerprint title uuid}
+
+      merge_keys = %w{access_token client context environment fingerprint format framework
+                      language level person platform request server title uuid }
       merge_keys.each do |key|
         data['rollbar'][key] && rb_item['data'][key] = data['rollbar'][key]
       end
@@ -67,16 +74,35 @@ class LogStash::Outputs::Rollbar < LogStash::Outputs::Base
     end
 
     # ...then put whatever's left in 'custom'...
-    rb_item['data']['body']['custom'] = data
+    rb_item['data']['custom'] = data
 
-    # ...and finally override the top level fields that have a specific meaning
+    # ...and finally override the fields that have a specific meaning
     rb_item['data']['timestamp'] = event.timestamp.to_i
-    rb_item['data']['level'] = @level
-    rb_item['data']['environment'] = @environment
-    rb_item['data']['body']['message']['body'] = event.sprintf(@format)
+    rb_item['data']['level'] = @level unless rb_item['data'].has_key?('level')
+    rb_item['data']['environment'] = @environment unless rb_item['data'].has_key?('environment')
 
     rb_item['data']['notifier']['name'] = 'logstash'
-    rb_item['data']['notifier']['version'] = '0.1.0'
+    rb_item['data']['notifier']['version'] = Gem.loaded_specs["logstash-output-rollbar"].version
+
+    # Construct the message body using either:
+    #
+    # - The default format string defined above "%{message}"
+    # - The format string specified in the rollbar plugin config section
+    # - The format string specified in the [rollbar][format] event field
+    #
+    format = rb_item['data'].has_key?('format') ? rb_item['data']['format'] : @format
+    rb_item['data']['body']['message']['body'] = event.sprintf(format)
+
+    # Treat the [rollbar][access_token] field as a special case, since we don't need to
+    # include it more than once in the Rollbar item
+    #
+    if rb_item['data'].has_key?('access_token')
+      rb_item['access_token'] = rb_item['data']['access_token']
+      rb_item['data'].delete('access_token')
+    else
+      rb_item['access_token'] = @access_token.value
+    end
+
 
     @logger.debug("Rollbar Item", :rb_item => rb_item)
 

data/logstash-output-rollbar.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-rollbar'
-  s.version         = '0.1.2'
+  s.version         = '0.2.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "The Rollbar Logstash output sends events to the Rollbar error monitoring service."
   s.description     = "This gem is a logstash plugin. Install using: $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"

metadata

@@ -1,47 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-rollbar
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Rollbar
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: logstash-core
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 'This gem is a logstash plugin. Install using: $LS_HOME/bin/plugin install
@@ -51,7 +51,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CONTRIBUTORS
 - Gemfile
 - LICENSE
@@ -66,25 +66,26 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: output
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.5
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.8
+signing_key: 
 specification_version: 4
-summary: The Rollbar Logstash output sends events to the Rollbar error monitoring service.
+summary: The Rollbar Logstash output sends events to the Rollbar error monitoring
+  service.
 test_files:
 - spec/outputs/rollbar_spec.rb