fluent-plugin-elasticsearch 2.12.3 → 2.12.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: dbe9d45b32f6a3db242d3f41dfa7c9c56ee425c9f36bbea1866c8fe61795f214
4
- data.tar.gz: 7070955261a6a34a2d27d97fd7c2b040d03d8ec725d7d58fedcda863a4aaa083
3
+ metadata.gz: 346ce09074a330559ab327a078ddc042e2555bb71afad491962083c272789751
4
+ data.tar.gz: 46689cc4b8496fdd57b620d303de60e46e661dce3ac6fe30fab5c7595396bd28
5
5
  SHA512:
6
- metadata.gz: 220580fb2c1405e355f49a30249ec1c5cb3f3774789d440057f3377f6493e26ca46569cd3081c7dc16493ea8056eb7fd12919d0c11137439e8bff55eb0749611
7
- data.tar.gz: c90e537194d8986180fa183c757a19694c638dc324e9edc9b8fb46a355991f06efc08acfac7af47bb3587a3c66fb3b1a969361ae64cf5c9fa589d6aa00f6c7bd
6
+ metadata.gz: 71857e0b0b56a2cb5fb4bd6b98f3931ce09397503aadae2df46ac470530065186a22c97625f53f8286f42df7ea4265c0af2073f332a280d7b959cb1376393d0a
7
+ data.tar.gz: 82325f62e7365816d0779e8d6656ac31cccc9d20a50723b78b9fe3cd32f3f7fcffbfd8dd62cebb71a203dc4db15be20c283067eaf10b61ad947a4ebca9d04ea1
data/History.md CHANGED
@@ -2,6 +2,9 @@
2
2
 
3
3
  ### [Unreleased]
4
4
 
5
+ ### 2.12.4
6
+ - #506 Rollover index will be in effect in case of template overwrite also. (#513)
7
+
5
8
  ### 2.12.3
6
9
  - Added log_es_400_reason configuration item (#511)
7
10
  - Allow a user to specify the rollover index date pattern (#510)
@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
3
3
 
4
4
  Gem::Specification.new do |s|
5
5
  s.name = 'fluent-plugin-elasticsearch'
6
- s.version = '2.12.3'
6
+ s.version = '2.12.4'
7
7
  s.authors = ['diogo', 'pitr']
8
8
  s.email = ['pitr.vern@gmail.com', 'me@diogoterror.com']
9
9
  s.description = %q{Elasticsearch output plugin for Fluent event collector}
@@ -73,14 +73,15 @@ module Fluent::ElasticsearchIndexTemplate
73
73
  if overwrite
74
74
  template_put(template_custom_name, get_custom_template(template_file, customize_template))
75
75
  log.info("Template '#{template_custom_name}' overwritten with #{template_file}.")
76
- return
77
- end
78
- if !template_exists?(template_custom_name)
79
- template_put(template_custom_name, get_custom_template(template_file, customize_template))
80
- log.info("Template configured, but no template installed. Installed '#{template_custom_name}' from #{template_file}.")
81
76
  else
82
- log.info("Template configured and already installed.")
77
+ if !template_exists?(template_custom_name)
78
+ template_put(template_custom_name, get_custom_template(template_file, customize_template))
79
+ log.info("Template configured, but no template installed. Installed '#{template_custom_name}' from #{template_file}.")
80
+ else
81
+ log.info("Template configured and already installed.")
82
+ end
83
83
  end
84
+
84
85
  if rollover_index
85
86
  if !client.indices.exists_alias(:name => deflector_alias_name)
86
87
  index_name_temp='<'+index_prefix.downcase+'-'+app_name.downcase+'-{'+index_date_pattern+'}-000001>'
@@ -529,6 +529,7 @@ class ElasticsearchOutput < Test::Unit::TestCase
529
529
  template_overwrite true
530
530
  customize_template {"--appid--": "myapp-logs","--index_prefix--":"mylogs"}
531
531
  deflector_alias myapp_deflector
532
+ rollover_index true
532
533
  index_prefix mylogs
533
534
  application_name myapp
534
535
  }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent-plugin-elasticsearch
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.12.3
4
+ version: 2.12.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - diogo
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2018-12-04 00:00:00.000000000 Z
12
+ date: 2018-12-10 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: fluentd