logstash-output-elasticsearch 10.3.1-java → 10.3.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0662d42a8fcb66fa69d4c9b348aef3595d9c8297ea5d37391cab2962452ba06a
-  data.tar.gz: 1fbbecbd7b70f22f3c8091402fc4335749b85d5431ead3b6d9ba2a4a5b12b1c7
+  metadata.gz: 21ff4b815353a8aa8e1d6e2fe191095ad78cf31916412fe8837c4213d261cb1c
+  data.tar.gz: e265c473d087c0f2c7a48b3b25ddff92ab73232827fb405fb2d65440d80b8b27
 SHA512:
-  metadata.gz: 929bf1d422d99ab11ac84c2a63e70de5e211ecdee64036c3c07844cc4b06c61aa22c2e49661c5521db2ee2ce6e8d069d03acfa9a17ff2be196a835a377455074
-  data.tar.gz: f077cb0d83d87b179a226bb9700b837e578adefa2efda988e8aa92225cf531ac2de2c021caeb7f4951e645418bd6646696ba7c54ff9eef9d73720497fd6d1f85
+  metadata.gz: d0349d45efa43b8c7a2d97f55c5b5175e5df013e2a84b661b449798b476406ec1da1d5a9e07f9a0bb6b85b85ef871f3215441e3fe6056a64ec9bf1dce2c725b8
+  data.tar.gz: 3ecf9c710e7e3d538688d8ba4efcc0bd34b60eebfc8245f5464908e6b7091c9db413d28b94c35cc36ef1e75313f1c985fff633f4f14a6510aefba559ec035e61

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 10.3.2
+ - [DOC] Replaced setting name with correct value [#919](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/919)
+ - Fix integration tests for Elasticsearch 7.6+ [#922](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/922)
+ - Fix integration tests for Elasticsearch API `7.5.0` [#923](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/923)
+
 ## 10.3.1
  - Fix: handle proxy => '' as if none was set [#912](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/912)
 

data/docs/index.asciidoc

@@ -69,7 +69,7 @@ the new template is installed.
 [NOTE]
 ================================================================================
 You cannot use dynamic variable substitution when `ilm_enabled` is `true` and 
-when using `ilm_rollover_pattern`.
+when using `ilm_rollover_alias`.
 
 ================================================================================
 
@@ -92,7 +92,7 @@ Example:
         index => "%{[some_field][sub_field]}-%{+YYYY.MM.dd}"
       }
     }
-
+ 
 **What to do in case there is no field in the event containing the destination index prefix?**
 
 You can use the `mutate` filter and conditionals to add a `[@metadata]` field (see https://www.elastic.co/guide/en/logstash/current/event-dependent-configuration.html#metadata) to set
@@ -335,7 +335,7 @@ The .cer or .pem file to validate the server's certificate
 
 Cloud authentication string ("<username>:<password>" format) is an alternative for the `user`/`password` pair.
 
-For mode details, check out the https://www.elastic.co/guide/en/logstash/current/connecting-to-cloud.html#_cloud_auth[cloud documentation]
+For more details, check out the https://www.elastic.co/guide/en/logstash/current/connecting-to-cloud.html#_cloud_auth[Logstash-to-Cloud documentation]
 
 [id="plugins-{type}s-{plugin}-cloud_id"]
 ===== `cloud_id`
@@ -345,7 +345,7 @@ For mode details, check out the https://www.elastic.co/guide/en/logstash/current
 
 Cloud ID, from the Elastic Cloud web console. If set `hosts` should not be used.
 
-For mode details, check out the https://www.elastic.co/guide/en/logstash/current/connecting-to-cloud.html#_cloud_id[cloud documentation]
+For more details, check out the https://www.elastic.co/guide/en/logstash/current/connecting-to-cloud.html#_cloud_id[Logstash-to-Cloud documentation]
 
 [id="plugins-{type}s-{plugin}-doc_as_upsert"]
 ===== `doc_as_upsert` 

data/lib/logstash/outputs/elasticsearch.rb

@@ -124,7 +124,7 @@ class LogStash::Outputs::ElasticSearch < LogStash::Outputs::Base
 
   # Cloud authentication string ("<username>:<password>" format) is an alternative for the `user`/`password` configuration.
   #
-  # For mode details, check out the https://www.elastic.co/guide/en/logstash/current/connecting-to-cloud.html#_cloud_auth[cloud documentation]
+  # For more details, check out the https://www.elastic.co/guide/en/logstash/current/connecting-to-cloud.html#_cloud_auth[cloud documentation]
   config :cloud_auth, :validate => :password
 
   # HTTP Path at which the Elasticsearch server lives. Use this if you must run Elasticsearch behind a proxy that remaps

data/lib/logstash/outputs/elasticsearch/common_configs.rb

@@ -101,7 +101,7 @@ module LogStash; module Outputs; class ElasticSearch
 
       # Cloud ID, from the Elastic Cloud web console. If set `hosts` should not be used.
       #
-      # For mode details, check out the https://www.elastic.co/guide/en/logstash/current/connecting-to-cloud.html#_cloud_id[cloud documentation]
+      # For more details, check out the https://www.elastic.co/guide/en/logstash/current/connecting-to-cloud.html#_cloud_id[cloud documentation]
       mod.config :cloud_id, :validate => :string
 
       # Set upsert content for update mode.s

data/logstash-output-elasticsearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '10.3.1'
+  s.version         = '10.3.2'
   s.licenses        = ['apache-2.0']
   s.summary         = "Stores logs in Elasticsearch"
   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/es_spec_helper.rb

@@ -139,7 +139,7 @@ module ESHelper
   end
 
   def clean_ilm(client)
-    client.get_ilm_policy.each_key {|key| client.delete_ilm_policy(name: key)}
+    client.get_ilm_policy.each_key { |key| client.delete_ilm_policy(name: key)  if key =~ /logstash-policy/ }
   end
 
   def supports_ilm?(client)

data/spec/integration/outputs/create_spec.rb

@@ -34,7 +34,7 @@ describe "client create actions", :integration => true do
       @es.indices.refresh
       # Wait or fail until everything's indexed.
       Stud::try(3.times) do
-        r = @es.search
+        r = @es.search(index: 'logstash-*')
         expect(r).to have_hits(1)
       end
     end

data/spec/integration/outputs/ilm_spec.rb

@@ -4,7 +4,7 @@ shared_examples_for 'an ILM enabled Logstash' do
 
   context 'with a policy with a maximum number of documents' do
     let (:policy) { small_max_doc_policy }
-    let (:ilm_policy_name) { "custom-policy"}
+    let (:ilm_policy_name) { "logstash-policy-custom"}
     let (:settings) { super.merge("ilm_policy" => ilm_policy_name)}
 
     it 'should rollover when the policy max docs is reached' do
@@ -37,10 +37,10 @@ shared_examples_for 'an ILM enabled Logstash' do
 
       # Wait or fail until everything's indexed.
       Stud::try(20.times) do
-        r = @es.search
+        r = @es.search(index: "#{expected_index}-*")
         expect(r).to have_hits(9)
       end
-      indexes_written = @es.search['hits']['hits'].each_with_object(Hash.new(0)) do |x, res|
+      indexes_written = @es.search(index: "#{expected_index}-*")['hits']['hits'].each_with_object(Hash.new(0)) do |x, res|
         index_written = x['_index']
         res[index_written] += 1
       end
@@ -53,7 +53,7 @@ shared_examples_for 'an ILM enabled Logstash' do
 
   context 'with a policy where the maximum number of documents is not reached' do
     let (:policy) { large_max_doc_policy }
-    let (:ilm_policy_name) { "custom-policy"}
+    let (:ilm_policy_name) { "logstash-policy-custom-policy"}
     let (:settings) { super.merge("ilm_policy" => ilm_policy_name)}
 
     it 'should ingest into a single index when max docs is not reached' do
@@ -78,10 +78,10 @@ shared_examples_for 'an ILM enabled Logstash' do
 
       # Wait or fail until everything's indexed.
       Stud::try(20.times) do
-        r = @es.search
+        r = @es.search(index: "#{expected_index}-*")
         expect(r).to have_hits(6)
       end
-      indexes_written = @es.search['hits']['hits'].each_with_object(Hash.new(0)) do |x, res|
+      indexes_written = @es.search(index: "#{expected_index}-*")['hits']['hits'].each_with_object(Hash.new(0)) do |x, res|
         index_written = x['_index']
         res[index_written] += 1
       end
@@ -93,10 +93,10 @@ end
 
 shared_examples_for 'an ILM disabled Logstash' do
   it 'should not create a rollover alias' do
-    expect(@es.get_alias).to be_empty
+    expect(@es.indices.exists_alias(name: "logstash")).to be_falsey
     subject.register
     sleep(1)
-    expect(@es.get_alias).to be_empty
+    expect(@es.indices.exists_alias(name: "logstash")).to be_falsey
   end
 
   it 'should not install the default policy' do
@@ -116,7 +116,7 @@ shared_examples_for 'an ILM disabled Logstash' do
 
   context 'with an existing policy that will roll over' do
     let (:policy) { small_max_doc_policy }
-    let (:ilm_policy_name) { "3_docs"}
+    let (:ilm_policy_name) { "logstash-policy-3_docs"}
     let (:settings) { super.merge("ilm_policy" => ilm_policy_name)}
 
     it 'should not roll over indices' do
@@ -139,10 +139,10 @@ shared_examples_for 'an ILM disabled Logstash' do
 
       # Wait or fail until everything's indexed.
       Stud::try(20.times) do
-        r = @es.search
+        r = @es.search(index: 'logstash-*')
         expect(r).to have_hits(6)
       end
-      indexes_written = @es.search['hits']['hits'].each_with_object(Hash.new(0)) do |x, res|
+      indexes_written = @es.search(index: 'logstash-*')['hits']['hits'].each_with_object(Hash.new(0)) do |x, res|
         index_written = x['_index']
         res[index_written] += 1
       end
@@ -285,10 +285,10 @@ if ESHelper.es_version_satisfies?(">= 6.6")
         context 'with a custom pattern' do
           let (:settings) { super.merge("ilm_pattern" => "000001")}
           it 'should create a rollover alias' do
-            expect(@es.indices.exists_alias(index: "logstash")).to be_falsey
+            expect(@es.indices.exists_alias(name: "logstash")).to be_falsey
             subject.register
             sleep(1)
-            expect(@es.indices.exists_alias(index: "logstash")).to be_truthy
+            expect(@es.indices.exists_alias(name: "logstash")).to be_truthy
             expect(@es.get_alias(name: "logstash")).to include("logstash-000001")
           end
         end
@@ -301,10 +301,10 @@ if ESHelper.es_version_satisfies?(">= 6.6")
         end
 
         it 'should create the default rollover alias' do
-          expect(@es.indices.exists_alias(index: "logstash")).to be_falsey
+          expect(@es.indices.exists_alias(name: "logstash")).to be_falsey
           subject.register
           sleep(1)
-          expect(@es.indices.exists_alias(index: "logstash")).to be_truthy
+          expect(@es.indices.exists_alias(name: "logstash")).to be_truthy
           expect(@es.get_alias(name: "logstash")).to include("logstash-#{todays_date}-000001")
         end
 
@@ -328,10 +328,10 @@ if ESHelper.es_version_satisfies?(">= 6.6")
 
           # Wait or fail until everything's indexed.
           Stud::try(20.times) do
-            r = @es.search
+            r = @es.search(index: "logstash-*")
             expect(r).to have_hits(6)
           end
-          indexes_written = @es.search['hits']['hits'].each_with_object(Hash.new(0)) do |x, res|
+          indexes_written = @es.search(index: "logstash-*")['hits']['hits'].each_with_object(Hash.new(0)) do |x, res|
             index_written = x['_index']
             res[index_written] += 1
           end
@@ -342,7 +342,7 @@ if ESHelper.es_version_satisfies?(">= 6.6")
       end
 
       context 'when not using the default policy' do
-        let (:ilm_policy_name) {"new_one"}
+        let (:ilm_policy_name) {"logstash-policy-small"}
         let (:settings) { super.merge("ilm_policy" => ilm_policy_name)}
         let (:policy) { small_max_doc_policy }
 
@@ -359,7 +359,7 @@ if ESHelper.es_version_satisfies?(">= 6.6")
       end
 
       context 'when using a time based policy' do
-        let (:ilm_policy_name) {"new_one"}
+        let (:ilm_policy_name) {"logstash-policy-time"}
         let (:settings) { super.merge("ilm_policy" => ilm_policy_name)}
         let (:policy) { max_age_policy("1d") }
 
@@ -377,10 +377,10 @@ if ESHelper.es_version_satisfies?(">= 6.6")
 
       context 'with the default template' do
         it 'should create the rollover alias' do
-          expect(@es.indices.exists_alias(index: expected_index)).to be_falsey
+          expect(@es.indices.exists_alias(name: expected_index)).to be_falsey
           subject.register
           sleep(1)
-          expect(@es.indices.exists_alias(index: expected_index)).to be_truthy
+          expect(@es.indices.exists_alias(name: expected_index)).to be_truthy
           expect(@es.get_alias(name: expected_index)).to include("#{expected_index}-#{todays_date}-000001")
         end
 
@@ -428,7 +428,7 @@ if ESHelper.es_version_satisfies?(">= 6.6")
           let (:template) { "spec/fixtures/template-with-policy-es6x.json" }
         end
         let (:ilm_enabled) { true }
-        let (:ilm_policy_name) { "custom-policy" }
+        let (:ilm_policy_name) { "logstash-policy-custom-policy" }
         let (:policy) { small_max_doc_policy }
 
         before :each do
@@ -438,18 +438,18 @@ if ESHelper.es_version_satisfies?(">= 6.6")
         it_behaves_like 'an ILM enabled Logstash'
 
         it 'should create the rollover alias' do
-          expect(@es.indices.exists_alias(index: ilm_rollover_alias)).to be_falsey
+          expect(@es.indices.exists_alias(name: ilm_rollover_alias)).to be_falsey
           subject.register
           sleep(1)
-          expect(@es.indices.exists_alias(index: ilm_rollover_alias)).to be_truthy
+          expect(@es.indices.exists_alias(name: ilm_rollover_alias)).to be_truthy
           expect(@es.get_alias(name: ilm_rollover_alias)).to include("#{ilm_rollover_alias}-#{todays_date}-000001")
         end
 
         context 'when the custom rollover alias already exists' do
           it 'should ignore the already exists error' do
-            expect(@es.indices.exists_alias(index: ilm_rollover_alias)).to be_falsey
+            expect(@es.indices.exists_alias(name: ilm_rollover_alias)).to be_falsey
             put_alias(@es, "#{ilm_rollover_alias}-#{todays_date}-000001", ilm_rollover_alias)
-            expect(@es.indices.exists_alias(index: ilm_rollover_alias)).to be_truthy
+            expect(@es.indices.exists_alias(name: ilm_rollover_alias)).to be_truthy
             subject.register
             sleep(1)
             expect(@es.get_alias(name: ilm_rollover_alias)).to include("#{ilm_rollover_alias}-#{todays_date}-000001")

data/spec/integration/outputs/ingest_pipeline_spec.rb

@@ -53,7 +53,7 @@ if ESHelper.es_version_satisfies?(">= 5")
 
       #Wait or fail until everything's indexed.
       Stud::try(20.times) do
-        r = @es.search
+        r = @es.search(index: 'logstash-*')
         expect(r).to have_hits(1)
       end
     end

data/spec/integration/outputs/no_es_on_startup_spec.rb

@@ -38,7 +38,7 @@ describe "elasticsearch is down on startup", :integration => true do
     allow_any_instance_of(LogStash::Outputs::ElasticSearch::HttpClient::Pool).to receive(:get_es_version).and_return(ESHelper.es_version)
     subject.multi_receive([event1, event2])
     @es.indices.refresh
-    r = @es.search
+    r = @es.search(index: 'logstash-*')
     expect(r).to have_hits(2)
   end
 
@@ -51,7 +51,7 @@ describe "elasticsearch is down on startup", :integration => true do
     end
     subject.multi_receive([event1, event2])
     @es.indices.refresh
-    r = @es.search
+    r = @es.search(index: 'logstash-*')
     expect(r).to have_hits(2)
   end
 

data/spec/integration/outputs/retry_spec.rb

@@ -142,7 +142,7 @@ describe "failures in bulk class expected behavior", :integration => true do
     subject.close
 
     @es.indices.refresh
-    r = @es.search
+    r = @es.search(index: 'logstash-*')
     expect(r).to have_hits(0)
   end
 
@@ -153,7 +153,7 @@ describe "failures in bulk class expected behavior", :integration => true do
     subject.multi_receive([event1])
     subject.close
     @es.indices.refresh
-    r = @es.search
+    r = @es.search(index: 'logstash-*')
     expect(r).to have_hits(1)
   end
 
@@ -163,7 +163,7 @@ describe "failures in bulk class expected behavior", :integration => true do
     subject.close
 
     @es.indices.refresh
-    r = @es.search
+    r = @es.search(index: 'logstash-*')
     expect(r).to have_hits(1)
   end
 end

data/spec/integration/outputs/templates_5x_spec.rb

@@ -40,7 +40,7 @@ if ESHelper.es_version_satisfies?(">= 5")
 
       # Wait or fail until everything's indexed.
       Stud::try(20.times) do
-        r = @es.search
+        r = @es.search(index: 'logstash-*')
         expect(r).to have_hits(8)
       end
     end

data/spec/integration/outputs/templates_spec.rb

@@ -40,7 +40,7 @@ if ESHelper.es_version_satisfies?("< 5")
 
       # Wait or fail until everything's indexed.
       Stud::try(20.times) do
-        r = @es.search
+        r = @es.search(index: 'logstash-*')
         expect(r).to have_hits(8)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 10.3.1
+  version: 10.3.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement