logstash-output-elasticsearch 10.0.1-java → 10.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5437ab2d215d988d230d11363dddb6759fca10691dc89c4bb6fb64ee9963e125
-  data.tar.gz: 9815fd0ac531dd9d345045a4fbcd912c8a552f49abcccb01c5ec97e223ef907b
+  metadata.gz: 90b70ef694ca408c5fe028903d6c9b1b6151eb98e99ecf57566cbf938e8ba2e2
+  data.tar.gz: 0067f5844ee31e31ea545d5854aaad2e309b34c1148ad8c8e1685698eba3c96e
 SHA512:
-  metadata.gz: 5f9273bdbcc946ee9fa7b646aa8a924432e618f2b5cfa5def541ffed237e7b365fd68a36b486cc6d30f049e3d1f7a40d31322fbcfca03c60be6fe2c38ff7020d
-  data.tar.gz: d607546d21651f80d4f0207d2e967ef03520a7faa40be4cc66507e972a6bf5b7763e9a701d2b9d5e98f3587a9bc4a9bca509789f545908d6b2fa01be1be4dd72
+  metadata.gz: 5ab0d62f7c399abde3fc3ca4df0a879ef792b95360f5ca78f61f2e24e1a3fc4aaab4436a3700f11c3238b9dcfa3ed9d425e0b8e321b6aa50d29720d0acc19d7e
+  data.tar.gz: 4f7719371b9af4b9d1b1a4223b39835416734252804739f60174f5cbb68a61a97376b7fe53c0ab7e8ff71ba7871138fc9f28dde9cb8cd4d88e1085e35e04801d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 10.0.2
+  - Fixed bug where index patterns in custom templates could be erroneously overwritten [#861](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/861)
+
 ## 10.0.1
   - Reverted `document_type` obsoletion [#844](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/844)
 

data/docs/index.asciidoc

@@ -126,9 +126,9 @@ See config below for an example:
 [source,ruby]
     output {
       elasticsearch {
-        ilm_rollover_alias: "custom"
-        ilm_pattern: "000001"
-        ilm_policy: "custom_policy"
+        ilm_rollover_alias => "custom"
+        ilm_pattern => "000001"
+        ilm_policy => "custom_policy"
       }
     }
 

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

@@ -48,7 +48,7 @@ module LogStash; module Outputs; class ElasticSearch;
         end
         if successful_connection?
           install_template
-          setup_ilm if ilm_enabled?
+          setup_ilm if ilm_in_use?
         end
       end
     end

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

@@ -4,20 +4,22 @@ module LogStash; module Outputs; class ElasticSearch
     ILM_POLICY_PATH = "default-ilm-policy.json"
 
     def setup_ilm
-      return unless ilm_enabled?
-      if default_index?(@index) || !default_rollover_alias?(@ilm_rollover_alias)
+      return unless ilm_in_use?
         logger.warn("Overwriting supplied index #{@index} with rollover alias #{@ilm_rollover_alias}") unless default_index?(@index)
         @index = @ilm_rollover_alias
         maybe_create_rollover_alias
         maybe_create_ilm_policy
-      end
     end
 
     def default_rollover_alias?(rollover_alias)
       rollover_alias == LogStash::Outputs::ElasticSearch::DEFAULT_ROLLOVER_ALIAS
     end
 
-    def ilm_enabled?
+    def ilm_alias_set?
+      default_index?(@index) || !default_rollover_alias?(@ilm_rollover_alias)
+    end
+
+    def ilm_in_use?
       return @ilm_actually_enabled if defined?(@ilm_actually_enabled)
       @ilm_actually_enabled =
         begin
@@ -28,7 +30,7 @@ module LogStash; module Outputs; class ElasticSearch
                 @logger.info("Index Lifecycle Management is set to 'auto', but will be disabled - #{error}")
                 false
               else
-                true
+                ilm_alias_set?
               end
             else
               @logger.info("Index Lifecycle Management is set to 'auto', but will be disabled - Your Elasticsearch cluster is before 7.0.0, which is the minimum version required to automatically run Index Lifecycle Management")
@@ -37,7 +39,7 @@ module LogStash; module Outputs; class ElasticSearch
           elsif @ilm_enabled.to_s == 'true'
             ilm_ready, error = ilm_ready?
             raise LogStash::ConfigurationError,"Index Lifecycle Management is set to enabled in Logstash, but cannot be used - #{error}"  unless ilm_ready
-            true
+            ilm_alias_set?
           else
             false
           end

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

@@ -11,7 +11,7 @@ module LogStash; module Outputs; class ElasticSearch
 
 
       template = get_template(plugin.template, plugin.maximum_seen_major_version)
-      add_ilm_settings_to_template(plugin, template) if plugin.ilm_enabled?
+      add_ilm_settings_to_template(plugin, template) if plugin.ilm_in_use?
       plugin.logger.info("Attempting to install template", :manage_template => template)
       install(plugin.client, template_name(plugin), template, plugin.template_overwrite)
     rescue => e
@@ -43,7 +43,7 @@ module LogStash; module Outputs; class ElasticSearch
     #                 if not and ILM is enabled, use the rollover alias
     #                 else use the default value of template_name
     def self.template_name(plugin)
-      plugin.ilm_enabled? && !plugin.original_params.key?('template_name') ? plugin.ilm_rollover_alias : plugin.template_name
+      plugin.ilm_in_use? && !plugin.original_params.key?('template_name') ? plugin.ilm_rollover_alias : plugin.template_name
     end
 
     def self.default_template_path(es_major_version)

data/logstash-output-elasticsearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '10.0.1'
+  s.version         = '10.0.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/fixtures/template-with-policy-es7x.json

@@ -6,7 +6,6 @@
     "number_of_shards": 1
   },
   "mappings" : {
-    "_doc" : {
       "dynamic_templates" : [ {
         "message_field" : {
           "path_match" : "message",
@@ -42,5 +41,5 @@
         }
       }
     }
-  }
+
 }

data/spec/integration/outputs/ilm_spec.rb

@@ -395,6 +395,24 @@ if ESHelper.es_version_satisfies?(">= 6.6")
         it_behaves_like 'an ILM enabled Logstash'
       end
 
+      context 'with a set index and a custom index pattern' do
+        if ESHelper.es_version_satisfies?(">= 7.0")
+          let (:template) { "spec/fixtures/template-with-policy-es7x.json" }
+        else
+          let (:template) { "spec/fixtures/template-with-policy-es6x.json" }
+        end
+
+        let (:settings) { super.merge("template" => template,
+                                      "index" => "overwrite-4")}
+
+        it 'should not overwrite the index patterns' do
+          subject.register
+          sleep(1)
+          expect(@es.indices.get_template(name: "logstash")["logstash"]).to have_index_pattern("overwrite-*")
+        end
+      end
+
+
       context 'with a custom template' do
         let (:ilm_rollover_alias) { "the_cat_in_the_hat" }
         let (:index) { ilm_rollover_alias }

data/spec/integration/outputs/parent_spec.rb

@@ -24,18 +24,19 @@ if ESHelper.es_version_satisfies?(">= 5.6")
       before do
         # Add mapping and a parent document
         index_url = "http://#{get_host_port()}/#{index}"
-        mapping = {
-          "mappings" => {
-            type => {
-              "properties" => {
-                join_field => {
-                  "type" => "join",
-                  "relations" => { parent_relation => child_relation }
-                }
-              }
+
+        properties = {
+          "properties" => {
+            join_field => {
+              "type" => "join",
+              "relations" => { parent_relation => child_relation }
             }
           }
         }
+
+        mapping = ESHelper.es_version_satisfies?('<7') ? { "mappings" => { type => properties } }
+                                                       : { "mappings" => properties}
+
         if ESHelper.es_version_satisfies?('<6')
           mapping.merge!({
                  "settings" => {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 10.0.1
+  version: 10.0.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement