logstash-output-elasticsearch 2.1.4-java → 2.1.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83b2c74b37b6266cc97c1801321c858302faf85d
-  data.tar.gz: f47adea8d8172e63fd433e2e58135dd6657bff07
+  metadata.gz: e1c06d07d392d4fba071aa01553091dd85461b3b
+  data.tar.gz: 368990ab9b1464f955418125388028940e8576aa
 SHA512:
-  metadata.gz: 0db5b0f53f6611fd0b7a5587d4d4a2764d849c02a984dea4dcf735c4f72986085d03acc0dc5ccd08fdc4817c01509aacc2dc98f52ddbb0dbfd74d297bf158d23
-  data.tar.gz: 07cc0da34006d0c84e756d54ea4938df4fbaa822c7c5a284770b50ad040e8270f5fe8ea021a743777fac00e83f0a9c918114a5ab0b145161a2a753b2d7eaa834
+  metadata.gz: 221ea508978c3bef5e9f03794b4af02d7e96234b60b7b2b1cf3f8b18a263b90e8bb1ef8d4a372bd1f6d376ccefe65d54fca7272b573a5762011e116057051506
+  data.tar.gz: daa946bd260816118bb2e88aa3173220f0999352417bc00af7974fc8b21365f1e1218096fb2e6430c987e04b0a48175b93139bb908c9cac52d672e5f2b68df55

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.1.5
+ - Sprintf style 'action' parameters no longer raise a LogStash::ConfigurationError
+
 ## 2.1.4
  - Improved the default template to disable fielddata on analyzed string fields. #309
  - Dependend on logstash-core 2.0.0 released version, rather than RC1

data/README.md

@@ -5,6 +5,8 @@ ATTN: This plugin is undergoing a [major refactor](https://github.com/logstash-p
 [![Build
 Status](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-elasticsearch-unit/badge/icon)](http://build-eu-00.elastic.co/view/LS%20Plugins/view/LS%20Outputs/job/logstash-plugin-output-elasticsearch-unit/)
 
+[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-output-elasticsearch.svg)](https://travis-ci.org/logstash-plugins/logstash-output-elasticsearch)
+
 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/elasticsearch/common.rb

@@ -14,6 +14,7 @@ module LogStash; module Outputs; class ElasticSearch;
       build_client
       install_template
       setup_buffer_and_handler
+      check_action_validity
 
       @logger.info("New Elasticsearch output", :class => self.class.name, :hosts => @hosts)
     end
@@ -56,6 +57,22 @@ module LogStash; module Outputs; class ElasticSearch;
       end
     end
 
+    def check_action_validity
+      raise LogStash::ConfigurationError, "No action specified!" unless @action
+
+      # If we're using string interpolation, we're good!
+      return if @action =~ /%{.+}/
+      return if valid_actions.include?(@action)
+
+      raise LogStash::ConfigurationError, "Action '#{@action}' is invalid! Pick one of #{valid_actions} or use a sprintf style statement"
+    end
+
+    # To be overidden by the -java version
+    VALID_HTTP_ACTIONS=["index", "delete", "create", "update"]
+    def valid_actions
+      VALID_HTTP_ACTIONS
+    end
+
     def retrying_submit(actions)
       retries_left = @max_retries+1 # +1 for the first attempt
 

data/lib/logstash/outputs/elasticsearch.rb

@@ -69,9 +69,11 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
   # - create: indexes a document, fails if a document by that id already exists in the index.
   # - update: updates a document by id. Update has a special case where you can upsert -- update a
   #   document if not already present. See the `upsert` option
+  # - A sprintf style string to change the action based on the content of the event. The value `%{[foo]}`
+  #   would use the foo field for the action
   #
   # For more details on actions, check out the http://www.elastic.co/guide/en/elasticsearch/reference/current/docs-bulk.html[Elasticsearch bulk API documentation]
-  config :action, :validate => %w(index delete create update), :default => "index"
+  config :action, :validate => :string, :default => "index"
 
   # Username to authenticate to a secure Elasticsearch cluster
   config :user, :validate => :string

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '2.1.4'
+  s.version         = '2.1.5'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch"
   s.description     = "Output events to elasticsearch"

data/spec/integration/outputs/templates_spec.rb

@@ -78,8 +78,8 @@ describe "index template expected behavior", :integration => true do
     insist { results["hits"]["hits"][0]["_source"]["geoip"]["location"] } == [ 0.0, 0.0 ]
   end
 
-  it "should index stopwords like 'at' " do
-    results = @es.search(:body => { "aggregations" => { "my_agg" => { "terms" => { "field" => "country" } } } })["aggregations"]["my_agg"]
+  it "aggregate .raw results correctly " do
+    results = @es.search(:body => { "aggregations" => { "my_agg" => { "terms" => { "field" => "country.raw" } } } })["aggregations"]["my_agg"]
     terms = results["buckets"].collect { |b| b["key"] }
 
     insist { terms }.include?("us")

data/spec/unit/outputs/elasticsearch_spec.rb

@@ -131,4 +131,26 @@ describe "outputs/elasticsearch" do
       sleep(options["timeout"] + 0.5)
     end
   end
+
+  describe "the action option" do
+    subject(:eso) {LogStash::Outputs::ElasticSearch.new(options)}
+    context "with a sprintf action" do
+      let(:options) { {"action" => "%{myactionfield}"} }
+
+      let(:event) { LogStash::Event.new("myactionfield" => "update", "message" => "blah") }
+
+      it "should interpolate the requested action value when creating an event_action_tuple" do
+        expect(eso.event_action_tuple(event).first).to eql("update")
+      end
+    end
+
+    context "with an invalid action" do
+      let(:options) { {"action" => "SOME Garbaaage"} }
+
+      it "should raise a configuration error" do
+        expect { subject.register }.to raise_error(LogStash::ConfigurationError)
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement