logstash-output-zabbix 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70568d1cb47d743ae426bd5e194835dd17d0cad2
-  data.tar.gz: d91132e126825c1f9e6ba4782eabeb3c6a42677b
+  metadata.gz: 6cd59a78de80ccd5503a765b91817ebbbc731444
+  data.tar.gz: 47fc4a6fa10b9f34c76975d461980b5824249a90
 SHA512:
-  metadata.gz: ef109c55e9bd189f7f41153095f1cbb237471dc28d2c7c7825cdb564d2dc1cfc7dc3749a5ac61ea58691edc824be542bb71b0f98795dd2f4df3294c3237a9c12
-  data.tar.gz: b95dc4a7ae23f92e7679187641b49471e635f37a13431e6a80047f1f0be35e91be460a2881dc2e454b64e1b28b8c1bf5503beacad5e2604e637f2f967e99e678
+  metadata.gz: 07eab4e762c6da79f06a73e7c8d02e97b471754ae58c1ead3ccf2da4559dd4934a90e9d5e13f417430b78e82a49c4bb51d0eeb1cf685ee8ac01bf29cb9b86958
+  data.tar.gz: 378d8de40cfe8d6ae19c4cb563177fcc5be3e5c915b7fa848e9d2e70b23786bc09c5087d2d5e7e6289e611f2274b89b17b813b2e703e8ba38cc5c3d5cd353aa5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.0.0
+  - Breaking: Updated plugin to use new Java Event APIs
+  - Use zabbix_protocol 0.1.5 or greater (tasty fixes for Zabbix)
+  - Make TravisCI use JRuby 1.7.25, and have Travis run the unit & integration tests.
 # 2.0.2
   - Depend on logstash-core-plugin-api instead of logstash-core, removing the need to mass update plugins on major releases of logstash
 # 2.0.1
@@ -7,4 +11,4 @@
    instead of using Thread.raise on the plugins' threads. Ref: https://github.com/elastic/logstash/pull/3895
  - Dependency on logstash-core update to 2.0
  - Update to allow semicolons (or not, e.g. Zabbix 2.0). #6 (davmrtl)
- - Update to prevent Logstash from crashing when the Zabbix server becomes unavailable while the plugin is sending data. #9 (dkanbier) 
+ - Update to prevent Logstash from crashing when the Zabbix server becomes unavailable while the plugin is sending data. #9 (dkanbier)

data/README.md

@@ -1,7 +1,6 @@
 # Logstash Plugin
 
-[![Build
-Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-zabbix-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-zabbix-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-output-zabbix.svg)](https://travis-ci.org/logstash-plugins/logstash-output-zabbix)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -56,7 +55,12 @@ gem "logstash-filter-awesome", :path => "/your/local/logstash-filter-awesome"
 ```
 - Install plugin
 ```sh
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
 bin/plugin install --no-verify
+
 ```
 - Run Logstash with your plugin
 ```sh
@@ -74,7 +78,12 @@ gem build logstash-filter-awesome.gemspec
 ```
 - Install the plugin from the Logstash home
 ```sh
-bin/plugin install /your/local/plugin/logstash-filter-awesome.gem
+# Logstash 2.3 and higher
+bin/logstash-plugin install --no-verify
+
+# Prior to Logstash 2.3
+bin/plugin install --no-verify
+
 ```
 - Start Logstash and proceed to test the plugin
 

data/lib/logstash/outputs/zabbix.rb

@@ -104,7 +104,7 @@ class LogStash::Outputs::Zabbix < LogStash::Outputs::Base
 
   public
   def field_check(event, fieldname)
-    if !event[fieldname]
+    if !event.get(fieldname)
       @logger.warn("Field referenced by #{fieldname} is missing")
       false
     else
@@ -142,10 +142,10 @@ class LogStash::Outputs::Zabbix < LogStash::Outputs::Base
     data = []
     (0..validated.length-1).step(2) do |idx|
       data << {
-        "host"  => event[@zabbix_host],
-        "key"   => event[validated[idx]],
-        "value" => event[validated[idx+1]],
-        "clock" => event["@timestamp"].to_i
+        "host"  => event.get(@zabbix_host),
+        "key"   => event.get(validated[idx]),
+        "value" => event.get(validated[idx+1]),
+        "clock" => event.get("@timestamp").to_i
       }
     end
     {
@@ -183,12 +183,12 @@ class LogStash::Outputs::Zabbix < LogStash::Outputs::Base
     total = info[5].to_i
     if failed == total
       @logger.warn("Zabbix server at #{@zabbix_server_host} rejected all items sent.",
-        :zabbix_host => event[@zabbix_host]
+        :zabbix_host => event.get(@zabbix_host)
       )
       false
     elsif failed > 0
       @logger.warn("Zabbix server at #{@zabbix_server_host} rejected #{info[3]} item(s).",
-        :zabbix_host => event[@zabbix_host]
+        :zabbix_host => event.get(@zabbix_host)
       )
       false
     elsif failed == 0 && total > 0
@@ -237,7 +237,7 @@ class LogStash::Outputs::Zabbix < LogStash::Outputs::Base
 
   public
   def receive(event)
-    
+
     return unless field_check(event, @zabbix_host)
     send_to_zabbix(event)
   end # def event

data/logstash-output-zabbix.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-zabbix'
-  s.version         = '2.0.2'
+  s.version         = '3.0.0'
   s.licenses      = ["Apache License (2.0)"]
   s.summary       = "This output sends key/value pairs to a Zabbix server."
-  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"
+  s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
   s.authors       = ["Elastic"]
   s.email         = "info@elastic.co"
   s.homepage      = "http://www.elastic.co/guide/en/logstash/current/index.html"
@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "output" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
-  s.add_runtime_dependency "zabbix_protocol"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
+  s.add_runtime_dependency "zabbix_protocol", ">= 0.1.5"
   s.add_runtime_dependency "logstash-codec-plain"
   s.add_development_dependency "logstash-devutils", ">= 0.0.12"
   s.add_development_dependency "logstash-filter-mutate"

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-zabbix
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   name: logstash-core-plugin-api
   prerelease: false
   type: :runtime
@@ -23,13 +23,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.5
   name: zabbix_protocol
   prerelease: false
   type: :runtime
@@ -37,7 +37,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !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
+description: This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []