fluent-plugin-elasticsearch 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e64450e9c4dca90c39c52e6c9bd2a6b3bc3958644f608fde7444c2024f68b62
-  data.tar.gz: 05a52be8643cacf7e5301d50a6d545c7105acd84ffca1ba417551929d4c0fed4
+  metadata.gz: 17e838ba667a43b9522686a97dcf538954ea34492d8cad31336cc044b42196f7
+  data.tar.gz: c3b897eb2de3b7a230ab01a510b93b97890d44a6edc2477bd876a706838b94fb
 SHA512:
-  metadata.gz: 3e6c52a7f807205e3f851039710b207f0afccdafd3fe9337a471e65752bc9aa8a5737790b33d0dc2e1a09569cad282cdc97450e3cffb23bef16907b9680cf521
-  data.tar.gz: af806e72ce8af92c9486432feca7d2a5fc1f5c241d98de54af6301321864fb29a88c2a81be1c487bb81292947d9d970df10d95b6b683434910b0c52b82bbb589
+  metadata.gz: 64b2e894d5f6b89368b6d4fe3ec4e1cc2285ffc567a3916768e674e56e7b7ff037e133dc771b1824e33ef4026d59f3138f4cce8b697fff2e0616a6eb5b05ad5c
+  data.tar.gz: 4288d08df20a953ecafa2ccc31d0c5a72b844c211a27e7f256b64e0fb300cc4934f1ee60c717df2a866f7b664bfe5f7a616426a6bc97150d161c15d7f7cfe52e

data/History.md

@@ -2,6 +2,9 @@
 
 ### [Unreleased]
 
+### 2.10.2
+- Use logstash_prefix_separator on elasticsearch_dynamic (#427)
+
 ### 2.10.1
 - Uplift Merge pull request #419 from jcantrill/retry_prefix (#421)
 - Uplift Merge pull request #418 from jcantrill/emit_exception (#420)

data/README.md

@@ -311,7 +311,7 @@ The path to the file containing the template to install.
 Specify index templates in form of hash. Can contain multiple templates.
 
 ```
-templates { "templane_name_1": "path_to_template_1_file", "templane_name_2": "path_to_template_2_file"}
+templates { "template_name_1": "path_to_template_1_file", "template_name_2": "path_to_template_2_file"}
 ```
 
 If `template_file` and `template_name` are set, then this parameter will be ignored.

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.10.1'
+  s.version       = '2.10.2'
   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/out_elasticsearch_dynamic.rb

@@ -170,9 +170,9 @@ module Fluent::Plugin
 
         if eval_or_val(dynamic_conf['logstash_format'])
           if eval_or_val(dynamic_conf['utc_index'])
-            target_index = "#{dynamic_conf['logstash_prefix']}-#{Time.at(time).getutc.strftime("#{dynamic_conf['logstash_dateformat']}")}"
+            target_index = "#{dynamic_conf['logstash_prefix']}#{@logstash_prefix_separator}#{Time.at(time).getutc.strftime("#{dynamic_conf['logstash_dateformat']}")}"
           else
-            target_index = "#{dynamic_conf['logstash_prefix']}-#{Time.at(time).strftime("#{dynamic_conf['logstash_dateformat']}")}"
+            target_index = "#{dynamic_conf['logstash_prefix']}#{@logstash_prefix_separator}#{Time.at(time).strftime("#{dynamic_conf['logstash_dateformat']}")}"
           end
         else
           target_index = dynamic_conf['index_name']

data/test/plugin/test_out_elasticsearch_dynamic.rb

@@ -426,6 +426,21 @@ class ElasticsearchOutputDynamic < Test::Unit::TestCase
     assert_equal(logstash_index, index_cmds.first['index']['_index'])
   end
 
+  def test_writes_to_logstash_index_with_specified_prefix_and_separator
+    separator = '_'
+    driver.configure("logstash_format true
+                      logstash_prefix_separator #{separator}
+                      logstash_prefix myprefix")
+    time = Time.parse Date.today.iso8601
+    logstash_index = "myprefix#{separator}#{time.getutc.strftime("%Y.%m.%d")}"
+    stub_elastic_ping
+    stub_elastic
+    driver.run(default_tag: 'test') do
+      driver.feed(time.to_i, sample_record)
+    end
+    assert_equal(logstash_index, index_cmds.first['index']['_index'])
+  end
+
   def test_writes_to_logstash_index_with_specified_prefix_uppercase
     driver.configure("logstash_format true
                       logstash_prefix MyPrefix")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd