fluent-plugin-elasticsearch 2.12.3 → 2.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbe9d45b32f6a3db242d3f41dfa7c9c56ee425c9f36bbea1866c8fe61795f214
-  data.tar.gz: 7070955261a6a34a2d27d97fd7c2b040d03d8ec725d7d58fedcda863a4aaa083
+  metadata.gz: 346ce09074a330559ab327a078ddc042e2555bb71afad491962083c272789751
+  data.tar.gz: 46689cc4b8496fdd57b620d303de60e46e661dce3ac6fe30fab5c7595396bd28
 SHA512:
-  metadata.gz: 220580fb2c1405e355f49a30249ec1c5cb3f3774789d440057f3377f6493e26ca46569cd3081c7dc16493ea8056eb7fd12919d0c11137439e8bff55eb0749611
-  data.tar.gz: c90e537194d8986180fa183c757a19694c638dc324e9edc9b8fb46a355991f06efc08acfac7af47bb3587a3c66fb3b1a969361ae64cf5c9fa589d6aa00f6c7bd
+  metadata.gz: 71857e0b0b56a2cb5fb4bd6b98f3931ce09397503aadae2df46ac470530065186a22c97625f53f8286f42df7ea4265c0af2073f332a280d7b959cb1376393d0a
+  data.tar.gz: 82325f62e7365816d0779e8d6656ac31cccc9d20a50723b78b9fe3cd32f3f7fcffbfd8dd62cebb71a203dc4db15be20c283067eaf10b61ad947a4ebca9d04ea1

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 2.12.4
+- #506 Rollover index will be in effect in case of template overwrite also. (#513)
+
 ### 2.12.3
 - Added log_es_400_reason configuration item (#511)
 - Allow a user to specify the rollover index date pattern (#510)

data/fluent-plugin-elasticsearch.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name          = 'fluent-plugin-elasticsearch'
-  s.version       = '2.12.3'
+  s.version       = '2.12.4'
   s.authors       = ['diogo', 'pitr']
   s.email         = ['pitr.vern@gmail.com', 'me@diogoterror.com']
   s.description   = %q{Elasticsearch output plugin for Fluent event collector}

data/lib/fluent/plugin/elasticsearch_index_template.rb

@@ -73,14 +73,15 @@ module Fluent::ElasticsearchIndexTemplate
     if overwrite
       template_put(template_custom_name, get_custom_template(template_file, customize_template))
       log.info("Template '#{template_custom_name}' overwritten with #{template_file}.")
-      return
-    end
-    if !template_exists?(template_custom_name)
-      template_put(template_custom_name, get_custom_template(template_file, customize_template))
-      log.info("Template configured, but no template installed. Installed '#{template_custom_name}' from #{template_file}.")
     else
-      log.info("Template configured and already installed.")
+      if !template_exists?(template_custom_name)
+        template_put(template_custom_name, get_custom_template(template_file, customize_template))
+        log.info("Template configured, but no template installed. Installed '#{template_custom_name}' from #{template_file}.")
+      else
+        log.info("Template configured and already installed.")
+      end
     end
+
     if rollover_index
       if !client.indices.exists_alias(:name => deflector_alias_name)
         index_name_temp='<'+index_prefix.downcase+'-'+app_name.downcase+'-{'+index_date_pattern+'}-000001>'

data/test/plugin/test_out_elasticsearch.rb

@@ -529,6 +529,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
       template_overwrite true
       customize_template {"--appid--": "myapp-logs","--index_prefix--":"mylogs"}
       deflector_alias myapp_deflector
+      rollover_index  true
       index_prefix    mylogs
       application_name myapp
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.12.3
+  version: 2.12.4
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd