logstash-output-elasticsearch 1.0.1-java → 1.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0373b6049087752b171319e0676b8f39c74a985f
-  data.tar.gz: e7354caf71f405678eabede5040c444bfac29c7d
+  metadata.gz: 606597e1ab355ae55f2e3a001d8b49d129c56c92
+  data.tar.gz: 93eefd3c03a06af5d37bc32bc5afa3b7636bacb8
 SHA512:
-  metadata.gz: 9308c2ef370c543edc5f8f82b68e1b51b815c2b5c71e1f59e899176dde28280fc05a9f3d182f689fbbd4034d01e9e5baec35cf071b59ed851d8d62dd679b42fe
-  data.tar.gz: c9eafd9683a6e28569cdf46af87e094ac601229483946fbd0d06268a0cf79931539737786fc7538985abe426524ae9f023fc92020069915d3da3115e9c3b37eb
+  metadata.gz: 4195eed5510df975b105a7b4d7ae7de0e2be1dd2b5f1a1a14e5ed6587ce5c8ccd20b2b50596d7cb525e9c8446c898859ae6c13646d1e58a960ad34383ef621f1
+  data.tar.gz: 49320ab0592c7a6ca9906cfd3de38cdd8b74bc8620ca90e9fb136d7bf1ff807a4bf65a2c02b9e39825f572540971e6d908607dc8a1f9fce59278136727129d2e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.2
+ - Upgrade Manticore HTTP Client
+
+## 1.0.1
+ - Allow client certificates
+
 ## 0.2.9
  - Add 'path' parameter for ES HTTP hosts behind a proxy on a subpath
 

data/lib/logstash/outputs/elasticsearch.rb

@@ -289,6 +289,13 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
   # Set the truststore password
   config :truststore_password, :validate => :password
 
+  # The keystore used to present a certificate to the server
+  # It can be either .jks or .p12
+  config :keystore, :validate => :path
+
+  # Set the truststore password
+  config :keystore_password, :validate => :password
+
   # Enable cluster sniffing (transport only)
   # Asks host for the list of all cluster nodes and adds them to the hosts list
   config :sniffing, :validate => :boolean, :default => false
@@ -603,6 +610,10 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
       ssl_options[:truststore_password] = @truststore_password.value if @truststore_password
     end
     ssl_options[:truststore] = @truststore if @truststore
+    if @keystore
+      ssl_options[:keystore] = @keystore
+      ssl_options[:keystore_password] = @keystore_password.value if @keystore_password
+    end
     if @ssl_certificate_verification == false
       @logger.warn [
         "** WARNING ** Detected UNSAFE options in elasticsearch output configuration!",

data/logstash-output-elasticsearch.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
 
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '1.0.1'
+  s.version         = '1.0.2'
   s.licenses        = ['apache-2.0']
   s.summary         = "Logstash Output to Elasticsearch"
   s.description     = "Output events to elasticsearch"
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
 
   if RUBY_PLATFORM == 'java'
     s.platform = RUBY_PLATFORM
-    s.add_runtime_dependency "manticore", '~> 0.3'
+    s.add_runtime_dependency "manticore", '~> 0.4.2'
   end
 
   s.add_development_dependency 'logstash-devutils'

data/spec/integration/outputs/templates_spec.rb

@@ -84,8 +84,8 @@ describe "index template expected behavior", :integration => true do
       end
 
       it "should index stopwords like 'at' " do
-        results = @es.search(:body => { "facets" => { "t" => { "terms" => { "field" => "country" } } } })["facets"]["t"]
-        terms = results["terms"].collect { |t| t["term"] }
+        results = @es.search(:body => { "aggregations" => { "my_agg" => { "terms" => { "field" => "country" } } } })["aggregations"]["my_agg"]
+        terms = results["buckets"].collect { |b| b["key"] }
 
         insist { terms }.include?("us")
 

data/spec/unit/outputs/elasticsearch_ssl_spec.rb

@@ -1,4 +1,5 @@
 require_relative "../../../spec/es_spec_helper"
+require 'stud/temporary'
 
 describe "SSL option" do
   ["node", "transport"].each do |protocol|
@@ -47,5 +48,35 @@ describe "SSL option" do
         subject.register
       end
     end
+
+    context "when using ssl with client certificates" do
+
+      let(:keystore_path) { Stud::Temporary.file.path }
+
+      after :each do
+        File.delete(keystore_path)
+      end
+
+      subject do
+        require "logstash/outputs/elasticsearch"
+        settings = {
+          "protocol" => protocol,
+          "host" => "node01",
+          "ssl" => true,
+          "keystore" => keystore_path,
+          "keystore_password" => "test"
+        }
+        next LogStash::Outputs::ElasticSearch.new(settings)
+      end
+
+
+      it "should pass the keystore parameters to the ES client" do
+        expect(::Elasticsearch::Client).to receive(:new) do |args|
+          expect(args[:ssl]).to include(:keystore => keystore_path, :keystore_password => "test")
+        end
+        subject.register
+      end
+
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-30 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -132,12 +132,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.4.2
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency