logstash-input-elasticsearch 4.0.6 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba92d9cefd99749a5e35518dfda179e40c8f0e72
-  data.tar.gz: 49948bf65f90442f72ea7cdaeaecb99682435361
+  metadata.gz: a7c2f2d4fa7bc002a154de1b2aa84bddc64312cf
+  data.tar.gz: e290171f93da3b6a970a5eb9bd6dc83102bdc667
 SHA512:
-  metadata.gz: 07b74b7bb5a9ef500727d3749b47ef828ab835c694207943d84ec45728674cbc8872f26aa881d1542ddb0fe95fd0e3484a67eafb8ecf3872e4af0fffaa9f1871
-  data.tar.gz: ddbb71da27fffaff23ee965da07136cc750172c6e0124db4b0464dd281d81e523deb542e2cc9f1fa9bdc64716494031db0869d3788a692cee7b8b19441fd47f0
+  metadata.gz: 0a47d63403a5f0934077a51c6e1d6e18acc62467ef8b8aefec94a3cc2f77db9f526f0c8551b0c32e41b1b235542c01e25e92f4a1cccf1a924095f7968f1a4469
+  data.tar.gz: 37669981d0014dbdd04606471fa563e4619d2dd586529c8e0e3daa4b618c14035cec018ab05fa614253880d1c3a179edf460221fcdf77d37884c5ad2969db825

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.1.0
+ - Enable use of docinfo (@metadata) fields in `add_field` decorations
+
 ## 4.0.6
   - Docs: Fix link syntax
 

data/lib/logstash/inputs/elasticsearch.rb

@@ -170,7 +170,6 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
 
   def push_hit(hit, output_queue)
     event = LogStash::Event.new(hit['_source'])
-    decorate(event)
 
     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.
@@ -190,6 +189,8 @@ class LogStash::Inputs::Elasticsearch < LogStash::Inputs::Base
       event.set(@docinfo_target, docinfo_target)
     end
 
+    decorate(event)
+
     output_queue << event
   end
 

data/logstash-input-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-input-elasticsearch'
-  s.version         = '4.0.6'
+  s.version         = '4.1.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/logstash-plugin install gemname. This gem is not a stand-alone program"

data/spec/inputs/elasticsearch_spec.rb

@@ -228,6 +228,27 @@ describe LogStash::Inputs::Elasticsearch do
         expect(event.get("[@metadata][_index]")).to eq('logstash-2014.10.12')
         expect(event.get("[@metadata][_id]")).to eq(nil)
       end
+
+      it 'should be able to reference metadata fields in `add_field` decorations' do
+        config = %q[
+          input {
+            elasticsearch {
+              hosts => ["localhost"]
+              query => '{ "query": { "match": { "city_name": "Okinawa" } }, "fields": ["message"] }'
+              docinfo => true
+              add_field => {
+                'identifier' => "foo:%{[@metadata][_type]}:%{[@metadata][_id]}"
+              }
+            }
+          }
+        ]
+
+        event = input(config) do |pipeline, queue|
+          queue.pop
+        end
+
+        expect(event.get('identifier')).to eq('foo:logs:C5b2xLQwTZa76jBmHIbwHQ')
+      end
     end
 
     context "when not defining the docinfo" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 4.0.6
+  version: 4.1.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement