logstash-input-elasticsearch 2.0.5 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deedbcbf82e03b04c83384a7ac7589792fc2bce3
-  data.tar.gz: 5bfdea0ee4a25d067095ec263a053d7779fa19b4
+  metadata.gz: 96c0e62c569c710059d82f01403e970a4f6fe1b7
+  data.tar.gz: ca1a79fa8076646ac0891f32dd29f72c26243830
 SHA512:
-  metadata.gz: 023f5ac43a9bb81cae782443d446f0728ecf0c0bdb06158109cc65912ecc8808bd55b5b859c31b6d1fd5cc29bf8211001c4d757b9487bb33802d6494cca55f5a
-  data.tar.gz: 8d9535323cbaf3798e5728ea8f17022f7f902c134dbd9639155803f5585d43329271ec65717a2a8bd3a27b71a0785a95796745ddeb658b4777f146151170b6ef
+  metadata.gz: d0c49e51cf7014a82fe8f668e3a63ada7f13a714b82860ed751ccfe632855c5d6a2320c5d8b4edbc6b45a6dcea360b62bf3eb22906da732d2aba1a0f0f9e262e
+  data.tar.gz: 38ea67752a6a34cb48f3f6e9ed1643438b9f279e699b21b94616cf455e80176d87a0f83fbb652c06d6a3ca98e9af81e52bcba6e7b8b3afc673584058cdcdf097

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
   - 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

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,8 +1,7 @@
 # Logstash Plugin
 
 [![Gem Version](https://badge.fury.io/rb/logstash-input-elasticsearch.svg)](https://badge.fury.io/rb/logstash-input-elasticsearch)
-[![Build
-Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-elasticsearch-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Inputs/job/logstash-plugin-input-elasticsearch-unit/)
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-input-elasticsearch.svg)](https://travis-ci.org/logstash-plugins/logstash-input-elasticsearch)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 
@@ -57,7 +56,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
@@ -75,7 +79,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/elasticsearch.rb

@@ -173,7 +173,7 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
 
     if @docinfo
       # do not assume event[@docinfo_target] to be in-place updatable. first get it, update it, then at the end set it in the event.
-      docinfo_target = event[@docinfo_target] || {}
+      docinfo_target = event.get(@docinfo_target) || {}
 
       unless docinfo_target.is_a?(Hash)
         @logger.error("Elasticsearch Input: Incompatible Event, incompatible type for the docinfo_target=#{@docinfo_target} field in the `_source` document, expected a hash got:", :docinfo_target_type => docinfo_target.class, :event => event)
@@ -186,7 +186,7 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
         docinfo_target[field] = hit[field]
       end
 
-      event[@docinfo_target] = docinfo_target
+      event.set(@docinfo_target, docinfo_target)
     end
 
     output_queue << event

data/logstash-input-elasticsearch.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-elasticsearch'
-  s.version         = '2.0.5'
+  s.version         = '3.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Read from an Elasticsearch cluster, based on search query results"
-  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 'elasticsearch', ['>= 1.0.6', '~> 1.0']
 

data/spec/inputs/elasticsearch_spec.rb

@@ -71,7 +71,7 @@ describe LogStash::Inputs::Elasticsearch do
     end
 
     insist { event }.is_a?(LogStash::Event)
-    insist { event["message"] } == [ "ohayo" ]
+    insist { event.get("message") } == [ "ohayo" ]
   end
 
   it "should retrieve json event from elasticseach with scan" do
@@ -128,7 +128,7 @@ describe LogStash::Inputs::Elasticsearch do
     end
 
     insist { event }.is_a?(LogStash::Event)
-    insist { event["message"] } == [ "ohayo" ]
+    insist { event.get("message") } == [ "ohayo" ]
   end
 
   context "with Elasticsearch document information" do
@@ -208,10 +208,10 @@ describe LogStash::Inputs::Elasticsearch do
           queue.pop
         end
 
-        expect(event[metadata_field]["_index"]).to eq('logstash-2014.10.12')
-        expect(event[metadata_field]["_type"]).to eq('logs')
-        expect(event[metadata_field]["_id"]).to eq('C5b2xLQwTZa76jBmHIbwHQ')
-        expect(event[metadata_field]["awesome"]).to eq("logstash")
+        expect(event.get("[#{metadata_field}][_index]")).to eq('logstash-2014.10.12')
+        expect(event.get("[#{metadata_field}][_type]")).to eq('logs')
+        expect(event.get("[#{metadata_field}][_id]")).to eq('C5b2xLQwTZa76jBmHIbwHQ')
+        expect(event.get("[#{metadata_field}][awesome]")).to eq("logstash")
       end
       
       it 'thows an exception if the `docinfo_target` exist but is not of type hash' do
@@ -243,9 +243,9 @@ describe LogStash::Inputs::Elasticsearch do
           queue.pop
         end
 
-        expect(event["[@metadata][_index]"]).to eq('logstash-2014.10.12')
-        expect(event["[@metadata][_type]"]).to eq('logs')
-        expect(event["[@metadata][_id]"]).to eq('C5b2xLQwTZa76jBmHIbwHQ')
+        expect(event.get("[@metadata][_index]")).to eq('logstash-2014.10.12')
+        expect(event.get("[@metadata][_type]")).to eq('logs')
+        expect(event.get("[@metadata][_id]")).to eq('C5b2xLQwTZa76jBmHIbwHQ')
       end
 
       it 'should move the document information to the specified field' do
@@ -264,9 +264,9 @@ describe LogStash::Inputs::Elasticsearch do
           queue.pop
         end
 
-        expect(event["[meta][_index]"]).to eq('logstash-2014.10.12')
-        expect(event["[meta][_type]"]).to eq('logs')
-        expect(event["[meta][_id]"]).to eq('C5b2xLQwTZa76jBmHIbwHQ')
+        expect(event.get("[meta][_index]")).to eq('logstash-2014.10.12')
+        expect(event.get("[meta][_type]")).to eq('logs')
+        expect(event.get("[meta][_id]")).to eq('C5b2xLQwTZa76jBmHIbwHQ')
       end
 
       it "should allow to specify which fields from the document info to save to the @metadata field" do
@@ -286,10 +286,10 @@ describe LogStash::Inputs::Elasticsearch do
           queue.pop
         end
 
-        expect(event["@metadata"].keys).to eq(fields)
-        expect(event["[@metadata][_type]"]).to eq(nil)
-        expect(event["[@metadata][_index]"]).to eq('logstash-2014.10.12')
-        expect(event["[@metadata][_id]"]).to eq(nil)
+        expect(event.get("@metadata").keys).to eq(fields)
+        expect(event.get("[@metadata][_type]")).to eq(nil)
+        expect(event.get("[@metadata][_index]")).to eq('logstash-2014.10.12')
+        expect(event.get("[@metadata][_id]")).to eq(nil)
       end
     end
 
@@ -308,9 +308,9 @@ describe LogStash::Inputs::Elasticsearch do
           queue.pop
         end
 
-        expect(event["[@metadata][_index]"]).to eq(nil)
-        expect(event["[@metadata][_type]"]).to eq(nil)
-        expect(event["[@metadata][_id]"]).to eq(nil)
+        expect(event.get("[@metadata][_index]")).to eq(nil)
+        expect(event.get("[@metadata][_type]")).to eq(nil)
+        expect(event.get("[@metadata][_id]")).to eq(nil)
       end
     end
   end

metadata

@@ -1,30 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-elasticsearch
 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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  name: logstash-core-plugin-api
-  prerelease: false
+        version: '2.0'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -33,9 +34,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: elasticsearch
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,34 +45,36 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json
-  prerelease: false
   type: :runtime
+  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'
-  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 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: []
@@ -93,7 +95,7 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -108,9 +110,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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 from an Elasticsearch cluster, based on search query results
 test_files: