logstash-output-riemann 2.0.2 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8639ad309d749fb8499e3f3d5d72cbb0341d4d4
-  data.tar.gz: 25df7446ca9e5ad0ffe6946fbfec876031e20c6e
+  metadata.gz: 9da1431db2c1e9464475df74525e448bd498d77e
+  data.tar.gz: 059ec0b04a8c435c2bbbf25b83fb27f068dea601
 SHA512:
-  metadata.gz: 9eb2a13e0f6d7dffdc88fa834f41f2c1d2946af63eb3f8f06fe85c0ad8458ada7ff4dacacdbc06078bc91f6fa9f5209368baf02f5a0020ebaa1170c1d0f14a72
-  data.tar.gz: 2ab03efe04b94432a81c9a223f51f860709a2c7f4cd269779b6c7e08705dee98847b889979722497bd4f329faa11d29a96da2d5d74c49e3b3f9ef613a5717caf
+  metadata.gz: 02b8650ce1fd4c4942b195b73cf32fcdcef8741978feea3df9aad8547f4e75e82ea11bf7b0dc69dc3a8768f6c4a73261becdd2f04dc2a604795a3b5266f406bc
+  data.tar.gz: 9854d21bb97046dae22874f0c88f7dd2f7c9b2b9e07643b500af39b83cec7e8df90588cc97db667b8a6253b57e297f8fa3dcfb0e0278a1c45f13bb89bb6f5929

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.0.5
+  - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
+# 2.0.4
+  - New dependency requirements for logstash-core for the 5.0 release
+## 2.0.3
+ - Fix: when using `map_fields` with `sender` hostname would not be properly set
+
 ## 2.0.0
  - Plugins were updated to follow the new shutdown semantic, this mainly allows Logstash to instruct input plugins to terminate gracefully, 
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895

data/README.md

@@ -1,5 +1,8 @@
 # Logstash Plugin
 
+[![Build
+Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-riemann-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-riemann-unit/)
+
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
 It is fully free and fully open source. The license is Apache 2.0, meaning you are pretty much free to use it however you want in whatever way.

data/lib/logstash/outputs/riemann.rb

@@ -110,11 +110,11 @@ class LogStash::Outputs::Riemann < LogStash::Outputs::Base
     this_level = Hash.new
     fields.each do |key, contents|
       next if key.start_with?("@")
-      field = parent.nil? ? key : "#{parent}.#{key}"                         
-      if contents.is_a?(Hash)                                     
-        this_level.merge! map_fields(field, contents)                                       
-      else                                                                                  
-        this_level[field.to_sym] = contents                                                          
+      field = parent.nil? ? key : "#{parent}.#{key}"
+      if contents.is_a?(Hash)
+        this_level.merge! map_fields(field, contents)
+      else
+        this_level[field.to_sym] = contents
       end
     end
     return this_level
@@ -122,10 +122,10 @@ class LogStash::Outputs::Riemann < LogStash::Outputs::Base
 
   public
   def receive(event)
-    
+
 
     r_event = build_riemann_formatted_event(event)
-    
+
     @logger.debug("Riemann event: ", :riemann_event => r_event)
     send_to_riemann(r_event)
   end # def receive
@@ -133,10 +133,9 @@ class LogStash::Outputs::Riemann < LogStash::Outputs::Base
   def build_riemann_formatted_event(event)
     # Let's build us an event, shall we?
     r_event = Hash.new
-    r_event[:host] = event.sprintf(@sender)
-    # riemann doesn't handle floats so we reduce the precision here
-    r_event[:time] = event["@timestamp"].to_i
+
     r_event[:description] = event["message"]
+
     if @riemann_event
       @riemann_event.each do |key, val|
         if ["ttl","metric"].include?(key)
@@ -150,6 +149,9 @@ class LogStash::Outputs::Riemann < LogStash::Outputs::Base
       r_event.merge! map_fields(nil, event.to_hash)
     end
     r_event[:tags] = event["tags"] if event["tags"].is_a?(Array)
+    r_event[:host] = event.sprintf(@sender)
+    # riemann doesn't handle floats so we reduce the precision here
+    r_event[:time] = event["@timestamp"].to_i
 
     return r_event
   end
@@ -160,7 +162,7 @@ class LogStash::Outputs::Riemann < LogStash::Outputs::Base
       @logger.debug("Riemann client proto: #{proto_client.to_s}")
       proto_client << riemann_formatted_event
     rescue Exception => e
-      @logger.debug("Unhandled exception", :error => e)
+      @logger.error("Unhandled exception", :error => e)
     end
   end # def send_to_riemann
 

data/logstash-output-riemann.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-riemann'
-  s.version         = '2.0.2'
+  s.version         = '2.0.5'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Riemann is a network event stream processing system."
   s.description     = "This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core", ">= 2.0.0.beta2", "< 3.0.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
 
   s.add_runtime_dependency 'riemann-client', ['0.2.1']
 

data/spec/outputs/riemann_spec.rb

@@ -3,11 +3,11 @@ require "logstash/plugin"
 require "logstash/json"
 
 describe "outputs/riemann" do
-
+  let(:output) { LogStash::Plugin.lookup("output", "riemann").new }
+  
   context "registration" do
 
     it "should register" do
-      output = LogStash::Plugin.lookup("output", "riemann").new
       expect {output.register}.not_to raise_error
     end
 
@@ -38,7 +38,6 @@ describe "outputs/riemann" do
 
   context "receive" do
 
-    output = LogStash::Plugin.lookup("output", "riemann").new
     data = {"message"=>"hello", "@version"=>"1", "@timestamp"=>"2015-06-03T23:34:54.076Z", "host"=>"vagrant-ubuntu-trusty-64"}
     event = LogStash::Event.new data
 
@@ -51,6 +50,7 @@ describe "outputs/riemann" do
 
   end
 
+
   context "map_fields" do
 
     context "with basic data" do
@@ -58,14 +58,12 @@ describe "outputs/riemann" do
       it "will return keys that do not start with @ sign." do
         data = {"message"=>"hello", "@version"=>"1", "@timestamp"=>"2015-06-03T23:34:54.076Z", "host"=>"vagrant-ubuntu-trusty-64"}
         expected_data = {:message=>"hello", :host=>"vagrant-ubuntu-trusty-64"}
-        output = LogStash::Plugin.lookup("output", "riemann").new
         expect(output.map_fields(nil, data)).to eq expected_data
       end
 
       it "will return a hash of nested values" do
         data = {"message"=>"hello", "node_info" => {"name" => "node1", "status" => "up"}, "@version"=>"1", "@timestamp"=>"2015-06-03T23:34:54.076Z", "host"=>"vagrant-ubuntu-trusty-64"}
         expected_data = {:message =>"hello", :host =>"vagrant-ubuntu-trusty-64", :"node_info.name" => "node1", :"node_info.status" => "up"}
-        output = LogStash::Plugin.lookup("output", "riemann").new
         expect(output.map_fields(nil, data)).to eq expected_data
       end
 
@@ -76,14 +74,22 @@ describe "outputs/riemann" do
 
     context "with map_fields" do
 
+      let(:output) { LogStash::Plugin.lookup("output", "riemann").new("map_fields" => "true") }
+
       it "will return symboled hash with at least :host, :time, and :description" do
         data = {"message"=>"hello", "node_info" => {"name" => "node1", "status" => "up"}, "@version"=>"1", "@timestamp"=>"2015-06-03T23:34:54.076Z", "host"=>"vagrant-ubuntu-trusty-64"}
         expected_data = {:time=>1433374494, :message =>"hello", :description =>"hello", :host =>"vagrant-ubuntu-trusty-64", :"node_info.name" => "node1", :"node_info.status" => "up"}
         event = LogStash::Event.new data
-        output = LogStash::Plugin.lookup("output", "riemann").new("map_fields" => "true")
         expect(output.build_riemann_formatted_event(event)).to eq expected_data
       end
 
+      it "will return a symboled hash with :host value from specified field" do
+        data = {"test_hostname" => "node1", "message" => "hello", "@version"=>"1", "@timestamp"=>"2015-06-03T23:34:54.076Z", "host"=>"vagrant-ubuntu-trusty-64"}
+        expected_data = {:time=>1433374494, :description =>"hello", :host =>"node1", :test_hostname => "node1", :message => "hello"}
+        event = LogStash::Event.new data
+        output.sender = "%{test_hostname}"
+        expect(output.build_riemann_formatted_event(event)).to eq expected_data
+      end
     end
 
     context "without map_fields" do
@@ -92,10 +98,16 @@ describe "outputs/riemann" do
         data = {"message"=>"hello", "node_info" => {"name" => "node1", "status" => "up"}, "@version"=>"1", "@timestamp"=>"2015-06-03T23:34:54.076Z", "host"=>"vagrant-ubuntu-trusty-64"}
         expected_data = {:time=>1433374494, :description =>"hello", :host =>"vagrant-ubuntu-trusty-64"}
         event = LogStash::Event.new data
-        output = LogStash::Plugin.lookup("output", "riemann").new
         expect(output.build_riemann_formatted_event(event)).to eq expected_data
       end
 
+      it "will return a symboled hash with :host value from specified field" do
+        data = {"test_hostname" => "node1", "message" => "hello", "@version"=>"1", "@timestamp"=>"2015-06-03T23:34:54.076Z", "host"=>"vagrant-ubuntu-trusty-64"}
+        expected_data = {:time=>1433374494, :description =>"hello", :host =>"node1"}
+        event = LogStash::Event.new data
+        output.sender = "%{test_hostname}"
+        expect(output.build_riemann_formatted_event(event)).to eq expected_data
+      end
     end
 
     context "with tags" do
@@ -104,11 +116,19 @@ describe "outputs/riemann" do
         data = {"tags"=> ["good_enough", "smart_enough", "doggone_it", "people_like_me"], "message"=>"hello", "node_info" => {"name" => "node1", "status" => "up"}, "@version"=>"1", "@timestamp"=>"2015-06-03T23:34:54.076Z", "host"=>"vagrant-ubuntu-trusty-64"}
         expected_data = {:tags => ["good_enough", "smart_enough", "doggone_it", "people_like_me"], :time=>1433374494, :description =>"hello", :host =>"vagrant-ubuntu-trusty-64"}
         event = LogStash::Event.new data
-        output = LogStash::Plugin.lookup("output", "riemann").new
         expect(output.build_riemann_formatted_event(event)).to eq expected_data
       end
 
     end
 
+    context "with riemann_event" do
+      it "will return a symboled hash with overriden description field" do
+        data = {"field_a" => "foobar", "message" => "hello", "@version"=>"1", "@timestamp"=>"2015-06-03T23:34:54.076Z", "host"=>"vagrant-ubuntu-trusty-64"}
+        expected_data = {:time=>1433374494, :description =>"foobar", :host =>"vagrant-ubuntu-trusty-64"}
+        event = LogStash::Event.new data
+        output.riemann_event = {"description" => "%{field_a}"}
+        expect(output.build_riemann_formatted_event(event)).to eq expected_data
+      end
+    end
   end
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-riemann
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.5
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - <
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: logstash-core
+        version: '1.0'
+  name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0.beta2
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -47,7 +41,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-devutils
@@ -55,13 +49,13 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-plain
@@ -69,7 +63,7 @@ dependencies:
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/plugin install gemname. This gem is not a stand-alone program
@@ -99,12 +93,12 @@ 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: []