logstash-output-elasticsearch 9.2.4-java → 9.3.0-java

data/spec/integration/outputs/ingest_pipeline_spec.rb

@@ -54,13 +54,13 @@ if ESHelper.es_version_satisfies?(">= 5")
       #Wait or fail until everything's indexed.
       Stud::try(20.times) do
         r = @es.search
-        expect(r["hits"]["total"]).to eq(1)
+        expect(r).to have_hits(1)
       end
     end
 
     it "indexes using the proper pipeline" do
       results = @es.search(:index => 'logstash-*', :q => "message:\"netcat\"")
-      expect(results["hits"]["total"]).to eq(1)
+      expect(results).to have_hits(1)
       expect(results["hits"]["hits"][0]["_source"]["response"]).to eq("200")
       expect(results["hits"]["hits"][0]["_source"]["bytes"]).to eq("182")
       expect(results["hits"]["hits"][0]["_source"]["verb"]).to eq("GET")

data/spec/integration/outputs/no_es_on_startup_spec.rb

@@ -39,7 +39,7 @@ describe "elasticsearch is down on startup", :integration => true do
     subject.multi_receive([event1, event2])
     @es.indices.refresh
     r = @es.search
-    expect(r["hits"]["total"]).to eql(2)
+    expect(r).to have_hits(2)
   end
 
   it 'should ingest events when Elasticsearch recovers after documents are sent' do
@@ -52,7 +52,7 @@ describe "elasticsearch is down on startup", :integration => true do
     subject.multi_receive([event1, event2])
     @es.indices.refresh
     r = @es.search
-    expect(r["hits"]["total"]).to eql(2)
+    expect(r).to have_hits(2)
   end
 
 end

data/spec/integration/outputs/retry_spec.rb

@@ -143,7 +143,7 @@ describe "failures in bulk class expected behavior", :integration => true do
 
     @es.indices.refresh
     r = @es.search
-    expect(r["hits"]["total"]).to eql(0)
+    expect(r).to have_hits(0)
   end
 
   it "successful requests should not be appended to retry queue" do
@@ -154,7 +154,7 @@ describe "failures in bulk class expected behavior", :integration => true do
     subject.close
     @es.indices.refresh
     r = @es.search
-    expect(r["hits"]["total"]).to eql(1)
+    expect(r).to have_hits(1)
   end
 
   it "should only index proper events" do
@@ -164,6 +164,6 @@ describe "failures in bulk class expected behavior", :integration => true do
 
     @es.indices.refresh
     r = @es.search
-    expect(r["hits"]["total"]).to eql(1)
+    expect(r).to have_hits(1)
   end
 end

data/spec/integration/outputs/templates_5x_spec.rb

@@ -41,19 +41,19 @@ if ESHelper.es_version_satisfies?(">= 5")
       # Wait or fail until everything's indexed.
       Stud::try(20.times) do
         r = @es.search
-        expect(r["hits"]["total"]).to eq(8)
+        expect(r).to have_hits(8)
       end
     end
 
     it "permits phrase searching on string fields" do
       results = @es.search(:q => "message:\"sample message\"")
-      expect(results["hits"]["total"]).to eq(1)
+      expect(results).to have_hits(1)
       expect(results["hits"]["hits"][0]["_source"]["message"]).to eq("sample message here")
     end
 
     it "numbers dynamically map to a numeric type and permit range queries" do
       results = @es.search(:q => "somevalue:[5 TO 105]")
-      expect(results["hits"]["total"]).to eq(2)
+      expect(results).to have_hits(2)
 
       values = results["hits"]["hits"].collect { |r| r["_source"]["somevalue"] }
       expect(values).to include(10)
@@ -63,22 +63,22 @@ if ESHelper.es_version_satisfies?(">= 5")
 
     it "does not create .keyword field for top-level message field" do
       results = @es.search(:q => "message.keyword:\"sample message here\"")
-      expect(results["hits"]["total"]).to eq(0)
+      expect(results).to have_hits(0)
     end
 
     it "creates .keyword field for nested message fields" do
       results = @es.search(:q => "somemessage.message.keyword:\"sample nested message here\"")
-      expect(results["hits"]["total"]).to eq(1)
+      expect(results).to have_hits(1)
     end
 
     it "creates .keyword field from any string field which is not_analyzed" do
       results = @es.search(:q => "country.keyword:\"us\"")
-      expect(results["hits"]["total"]).to eq(1)
+      expect(results).to have_hits(1)
       expect(results["hits"]["hits"][0]["_source"]["country"]).to eq("us")
 
       # partial or terms should not work.
       results = @es.search(:q => "country.keyword:\"u\"")
-      expect(results["hits"]["total"]).to eq(0)
+      expect(results).to have_hits(0)
     end
 
     it "make [geoip][location] a geo_point" do

data/spec/integration/outputs/templates_spec.rb

@@ -41,19 +41,19 @@ if ESHelper.es_version_satisfies?("< 5")
       # Wait or fail until everything's indexed.
       Stud::try(20.times) do
         r = @es.search
-        expect(r["hits"]["total"]).to eq(8)
+        expect(r).to have_hits(8)
       end
     end
 
     it "permits phrase searching on string fields" do
       results = @es.search(:q => "message:\"sample message\"")
-      expect(results["hits"]["total"]).to eq(1)
+      expect(results).to have_hits(1)
       expect(results["hits"]["hits"][0]["_source"]["message"]).to eq("sample message here")
     end
 
     it "numbers dynamically map to a numeric type and permit range queries" do
       results = @es.search(:q => "somevalue:[5 TO 105]")
-      expect(results["hits"]["total"]).to eq(2)
+      expect(results).to have_hits(2)
 
       values = results["hits"]["hits"].collect { |r| r["_source"]["somevalue"] }
       expect(values).to include(10)
@@ -63,22 +63,22 @@ if ESHelper.es_version_satisfies?("< 5")
 
     it "does not create .raw field for the message field" do
       results = @es.search(:q => "message.raw:\"sample message here\"")
-      expect(results["hits"]["total"]).to eq(0)
+      expect(results).to have_hits(0)
     end
 
     it "creates .raw field for nested message fields" do
       results = @es.search(:q => "somemessage.message.raw:\"sample nested message here\"")
-      expect(results["hits"]["total"]).to eq(1)
+      expect(results).to have_hits(1)
     end
 
     it "creates .raw field from any string field which is not_analyzed" do
       results = @es.search(:q => "country.raw:\"us\"")
-      expect(results["hits"]["total"]).to eq(1)
+      expect(results).to have_hits(1)
       expect(results["hits"]["hits"][0]["_source"]["country"]).to eq("us")
 
       # partial or terms should not work.
       results = @es.search(:q => "country.raw:\"u\"")
-      expect(results["hits"]["total"]).to eq(0)
+      expect(results).to have_hits(0)
     end
 
     it "make [geoip][location] a geo_point" do

data/spec/support/elasticsearch/api/actions/delete_ilm_policy.rb

@@ -0,0 +1,19 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+module Elasticsearch
+  module API
+    module Actions
+
+      # Update the password of the specified user
+      def delete_ilm_policy(arguments={})
+        method = HTTP_DELETE
+        path   = Utils.__pathify '_ilm/policy/',
+                                 Utils.__escape(arguments[:name])
+        params = {}
+        perform_request(method, path, params, nil).body
+      end
+    end
+  end
+end

data/spec/support/elasticsearch/api/actions/get_alias.rb

@@ -0,0 +1,18 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+module Elasticsearch
+  module API
+    module Actions
+
+      # Retrieve the list of index lifecycle management policies
+      def get_alias(arguments={})
+        method = HTTP_GET
+        path   = Utils.__pathify '_alias', Utils.__escape(arguments[:name])
+        params = {}
+        perform_request(method, path, params, nil).body
+      end
+    end
+  end
+end

data/spec/support/elasticsearch/api/actions/get_ilm_policy.rb

@@ -0,0 +1,18 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+module Elasticsearch
+  module API
+    module Actions
+
+      # Retrieve the list of index lifecycle management policies
+      def get_ilm_policy(arguments={})
+        method = HTTP_GET
+        path   = Utils.__pathify '_ilm/policy', Utils.__escape(arguments[:name])
+        params = {}
+        perform_request(method, path, params, nil).body
+      end
+    end
+  end
+end

data/spec/support/elasticsearch/api/actions/put_alias.rb

@@ -0,0 +1,24 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+module Elasticsearch
+  module API
+    module Actions
+
+      # @option arguments [String] :name The name of the alias (*Required*)
+      # @option arguments [Hash]   :The alias definition(*Required*)
+
+      def put_alias(arguments={})
+        raise ArgumentError, "Required argument 'name' missing" unless arguments[:name]
+        raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
+        method = HTTP_PUT
+        path   = Utils.__pathify Utils.__escape(arguments[:name])
+
+        params = Utils.__validate_and_extract_params arguments
+        body   = arguments[:body]
+        perform_request(method, path, params, body.to_json).body
+      end
+    end
+  end
+end

data/spec/support/elasticsearch/api/actions/put_ilm_policy.rb

@@ -0,0 +1,25 @@
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License;
+# you may not use this file except in compliance with the Elastic License.
+
+module Elasticsearch
+  module API
+    module Actions
+
+      # @option arguments [String] :name The name of the policy (*Required*)
+      # @option arguments [Hash] :body The policy definition (*Required*)
+
+      def put_ilm_policy(arguments={})
+        raise ArgumentError, "Required argument 'name' missing" unless arguments[:name]
+        raise ArgumentError, "Required argument 'body' missing" unless arguments[:body]
+        method = HTTP_PUT
+        path   = Utils.__pathify '_ilm/policy/', Utils.__escape(arguments[:name])
+
+        params = Utils.__validate_and_extract_params arguments
+
+        body   = arguments[:body]
+        perform_request(method, path, params, body.to_json).body
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 9.2.4
+  version: 9.3.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2018-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -158,6 +158,7 @@ files:
 - lib/logstash/outputs/elasticsearch.rb
 - lib/logstash/outputs/elasticsearch/common.rb
 - lib/logstash/outputs/elasticsearch/common_configs.rb
+- lib/logstash/outputs/elasticsearch/default-ilm-policy.json
 - lib/logstash/outputs/elasticsearch/elasticsearch-template-es2x.json
 - lib/logstash/outputs/elasticsearch/elasticsearch-template-es5x.json
 - lib/logstash/outputs/elasticsearch/elasticsearch-template-es6x.json
@@ -166,6 +167,7 @@ files:
 - lib/logstash/outputs/elasticsearch/http_client/manticore_adapter.rb
 - lib/logstash/outputs/elasticsearch/http_client/pool.rb
 - lib/logstash/outputs/elasticsearch/http_client_builder.rb
+- lib/logstash/outputs/elasticsearch/ilm.rb
 - lib/logstash/outputs/elasticsearch/template_manager.rb
 - logstash-output-elasticsearch.gemspec
 - spec/es_spec_helper.rb
@@ -179,6 +181,8 @@ files:
 - spec/fixtures/scripts/painless/scripted_update.painless
 - spec/fixtures/scripts/painless/scripted_update_nested.painless
 - spec/fixtures/scripts/painless/scripted_upsert.painless
+- spec/fixtures/template-with-policy-es6x.json
+- spec/fixtures/template-with-policy-es7x.json
 - spec/fixtures/test_certs/ca/ca.crt
 - spec/fixtures/test_certs/ca/ca.key
 - spec/fixtures/test_certs/test.crt
@@ -187,6 +191,7 @@ files:
 - spec/integration/outputs/create_spec.rb
 - spec/integration/outputs/delete_spec.rb
 - spec/integration/outputs/groovy_update_spec.rb
+- spec/integration/outputs/ilm_spec.rb
 - spec/integration/outputs/index_spec.rb
 - spec/integration/outputs/index_version_spec.rb
 - spec/integration/outputs/ingest_pipeline_spec.rb
@@ -200,6 +205,11 @@ files:
 - spec/integration/outputs/templates_5x_spec.rb
 - spec/integration/outputs/templates_spec.rb
 - spec/integration/outputs/update_spec.rb
+- spec/support/elasticsearch/api/actions/delete_ilm_policy.rb
+- spec/support/elasticsearch/api/actions/get_alias.rb
+- spec/support/elasticsearch/api/actions/get_ilm_policy.rb
+- spec/support/elasticsearch/api/actions/put_alias.rb
+- spec/support/elasticsearch/api/actions/put_ilm_policy.rb
 - spec/unit/http_client_builder_spec.rb
 - spec/unit/outputs/elasticsearch/http_client/manticore_adapter_spec.rb
 - spec/unit/outputs/elasticsearch/http_client/pool_spec.rb
@@ -247,6 +257,8 @@ test_files:
 - spec/fixtures/scripts/painless/scripted_update.painless
 - spec/fixtures/scripts/painless/scripted_update_nested.painless
 - spec/fixtures/scripts/painless/scripted_upsert.painless
+- spec/fixtures/template-with-policy-es6x.json
+- spec/fixtures/template-with-policy-es7x.json
 - spec/fixtures/test_certs/ca/ca.crt
 - spec/fixtures/test_certs/ca/ca.key
 - spec/fixtures/test_certs/test.crt
@@ -255,6 +267,7 @@ test_files:
 - spec/integration/outputs/create_spec.rb
 - spec/integration/outputs/delete_spec.rb
 - spec/integration/outputs/groovy_update_spec.rb
+- spec/integration/outputs/ilm_spec.rb
 - spec/integration/outputs/index_spec.rb
 - spec/integration/outputs/index_version_spec.rb
 - spec/integration/outputs/ingest_pipeline_spec.rb
@@ -268,6 +281,11 @@ test_files:
 - spec/integration/outputs/templates_5x_spec.rb
 - spec/integration/outputs/templates_spec.rb
 - spec/integration/outputs/update_spec.rb
+- spec/support/elasticsearch/api/actions/delete_ilm_policy.rb
+- spec/support/elasticsearch/api/actions/get_alias.rb
+- spec/support/elasticsearch/api/actions/get_ilm_policy.rb
+- spec/support/elasticsearch/api/actions/put_alias.rb
+- spec/support/elasticsearch/api/actions/put_ilm_policy.rb
 - spec/unit/http_client_builder_spec.rb
 - spec/unit/outputs/elasticsearch/http_client/manticore_adapter_spec.rb
 - spec/unit/outputs/elasticsearch/http_client/pool_spec.rb