logstash-input-syslog 2.0.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b415d34a496e90e13c45686924f710b2ff2953d
-  data.tar.gz: 5eab1ca7f3e8b0776955c68b087818206efb575f
+  metadata.gz: ea70c51553600b7e2cef7b04629fd640d475a8e0
+  data.tar.gz: a3f080382a3b4325ac3733912eddb2df02683b53
 SHA512:
-  metadata.gz: d9d264b89497115f10fd521cf14eb2723def18b488a2731eccdca297f40e28f28057a85c539e0646035a4ff468d82363d0a29cb7634247b6da69c1a685377922
-  data.tar.gz: 8ad21c3362ff67341077d0a133fce507570f01b67fb55427cf80c7599fbcf38ff469a9c79343e81bedd9b915f53908c964d56ab89649a49c87ae8f961a7b3d0e
+  metadata.gz: dcbec20bdf587e69259a138e2385dea1066ae744726cff25527e6839131b6ade3595ff0fe1035914e6e9f37555919f2bbd436dff7448bb5e1a3f837b209879ef
+  data.tar.gz: 12baf725da37045110aef3ea358e1d3300c676040e0537451b001c469af4890b1a3006a8c7247493a6b4aca27c7721e41517d90292d914a6e994e28b301eafc1

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 3.0.0
+  - Update the plugin to the version 2.0 of the plugin api, this change is required for Logstash 5.0 compatibility. See https://github.com/elastic/logstash/issues/5141
 # 2.0.5
   - Temporary specs fix, see https://github.com/logstash-plugins/logstash-input-syslog/pull/25
 # 2.0.4

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
-gemspec
+
+# Specify your gem's dependencies in logstash-mass_effect.gemspec
+gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012–2015 Elasticsearch <http://www.elastic.co>
+Copyright (c) 2012–2016 Elasticsearch <http://www.elastic.co>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/README.md

@@ -1,7 +1,6 @@
 # Logstash Plugin
 
-[![Build
-Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-syslog-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-syslog-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-syslog.svg)](https://travis-ci.org/logstash-plugins/logstash-input-syslog)
 
 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/inputs/syslog.rb

@@ -182,7 +182,7 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
   def decode(host, output_queue, data)
     @codec.decode(data) do |event|
       decorate(event)
-      event["host"] = host
+      event.set("host", host)
       syslog_relay(event)
       output_queue << event
     end
@@ -225,40 +225,40 @@ class LogStash::Inputs::Syslog < LogStash::Inputs::Base
   def syslog_relay(event)
     @grok_filter.filter(event)
 
-    if event["tags"].nil? || !event["tags"].include?(@grok_filter.tag_on_failure)
+    if event.get("tags").nil? || !event.get("tags").include?(@grok_filter.tag_on_failure)
       # Per RFC3164, priority = (facility * 8) + severity
       #                       = (facility << 3) & (severity)
-      priority = event["priority"].to_i rescue 13
+      priority = event.get("priority").to_i rescue 13
       severity = priority & 7   # 7 is 111 (3 bits)
       facility = priority >> 3
-      event["priority"] = priority
-      event["severity"] = severity
-      event["facility"] = facility
+      event.set("priority", priority)
+      event.set("severity", severity)
+      event.set("facility", facility)
 
-      event["timestamp"] = event["timestamp8601"] if event.include?("timestamp8601")
+      event.set("timestamp", event.get("timestamp8601")) if event.include?("timestamp8601")
       @date_filter.filter(event)
     else
-      @logger.info? && @logger.info("NOT SYSLOG", :message => event["message"])
+      @logger.info? && @logger.info("NOT SYSLOG", :message => event.get("message"))
 
       # RFC3164 says unknown messages get pri=13
       priority = 13
-      event["priority"] = 13
-      event["severity"] = 5   # 13 & 7 == 5
-      event["facility"] = 1   # 13 >> 3 == 1
+      event.set("priority", 13)
+      event.set("severity", 5)   # 13 & 7 == 5
+      event.set("facility", 1)   # 13 >> 3 == 1
     end
 
     # Apply severity and facility metadata if
     # use_labels => true
     if @use_labels
-      facility_number = event["facility"]
-      severity_number = event["severity"]
+      facility_number = event.get("facility")
+      severity_number = event.get("severity")
 
       if @facility_labels[facility_number]
-        event["facility_label"] = @facility_labels[facility_number]
+        event.set("facility_label", @facility_labels[facility_number])
       end
 
       if @severity_labels[severity_number]
-        event["severity_label"] = @severity_labels[severity_number]
+        event.set("severity_label", @severity_labels[severity_number])
       end
     end
   end # def syslog_relay

data/logstash-input-syslog.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-syslog'
-  s.version         = '2.0.5'
+  s.version         = '3.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read syslog messages as events over the network."
-  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"
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.metadata = { "logstash_plugin" => "true", "logstash_group" => "input" }
 
   # Gem dependencies
-  s.add_runtime_dependency "logstash-core-plugin-api", "~> 1.0"
+  s.add_runtime_dependency "logstash-core-plugin-api", "~> 2.0"
 
   s.add_runtime_dependency 'concurrent-ruby'
   s.add_runtime_dependency 'thread_safe'

data/spec/inputs/syslog_spec.rb

@@ -53,9 +53,9 @@ describe LogStash::Inputs::Syslog do
 
     insist { events.length } == event_count
     events.each do |event|
-      insist { event["priority"] } == 164
-      insist { event["severity"] } == 4
-      insist { event["facility"] } == 20
+      insist { event.get("priority") } == 164
+      insist { event.get("severity") } == 4
+      insist { event.get("facility") } == 20
     end
   end
 
@@ -83,7 +83,7 @@ describe LogStash::Inputs::Syslog do
 
     insist { events.length } == event_count
     event_count.times do |i|
-      insist { events[i]["tags"] } == ["_grokparsefailure_sysloginput"]
+      insist { events[i].get("tags") } == ["_grokparsefailure_sysloginput"]
     end
   end
 
@@ -114,7 +114,7 @@ describe LogStash::Inputs::Syslog do
 
     insist { events.length } == event_count
     events.each do |event|
-      insist { event["@timestamp"].to_iso8601 } == "#{Time.now.year}-10-26T15:19:25.000Z"
+      insist { event.get("@timestamp").to_iso8601 } == "#{Time.now.year}-10-26T15:19:25.000Z"
     end
   end
 
@@ -139,7 +139,7 @@ describe LogStash::Inputs::Syslog do
     end
 
     # chances platform timezone is not UTC so ignore the hours
-    insist { event["@timestamp"].to_iso8601 } =~ /#{Time.now.year}-10-26T\d\d:19:25.000Z/
+    insist { event.get("@timestamp").to_iso8601 } =~ /#{Time.now.year}-10-26T\d\d:19:25.000Z/
   end
 
   it "should support non UTC timezone" do
@@ -150,7 +150,7 @@ describe LogStash::Inputs::Syslog do
 
     syslog_event = LogStash::Event.new({ "message" => "<164>Oct 26 15:19:25 1.2.3.4 %ASA-4-106023: Deny udp src DRAC:10.1.2.3/43434" })
     input.syslog_relay(syslog_event)
-    insist { syslog_event["@timestamp"].to_iso8601 } == "#{Time.now.year}-10-26T20:19:25.000Z"
+    insist { syslog_event.get("@timestamp").to_iso8601 } == "#{Time.now.year}-10-26T20:19:25.000Z"
 
     input.close
   end
@@ -162,13 +162,13 @@ describe LogStash::Inputs::Syslog do
     # event which is not syslog should have a new tag
     event = LogStash::Event.new({ "message" => "hello world, this is not syslog RFC3164" })
     input.syslog_relay(event)
-    insist { event["tags"] } ==  ["_grokparsefailure_sysloginput"]
+    insist { event.get("tags") } ==  ["_grokparsefailure_sysloginput"]
 
     syslog_event = LogStash::Event.new({ "message" => "<164>Oct 26 15:19:25 1.2.3.4 %ASA-4-106023: Deny udp src DRAC:10.1.2.3/43434" })
     input.syslog_relay(syslog_event)
-    insist { syslog_event["priority"] } ==  164
-    insist { syslog_event["severity"] } ==  4
-    insist { syslog_event["tags"] } ==  nil
+    insist { syslog_event.get("priority") } ==  164
+    insist { syslog_event.get("severity") } ==  4
+    insist { syslog_event.get("tags") } ==  nil
 
     input.close
   end

metadata

@@ -1,134 +1,136 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-syslog
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Elastic
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  prerelease: false
+        version: '2.0'
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: thread_safe
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thread_safe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: stud
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.22
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 0.1.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.22
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 0.1.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: logstash-codec-plain
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-filter-grok
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logstash-filter-grok
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-filter-date
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logstash-filter-date
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: logstash-devutils
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-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
+  prerelease: false
+  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/logstash-plugin install gemname. This
+  gem is not a stand-alone program
 email: info@elastic.co
 executables: []
 extensions: []
@@ -149,24 +151,24 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-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.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Read syslog messages as events over the network.
 test_files: