fluent-plugin-elasticsearch 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75f13a6667d8bb5183b4a30c48db1d5d3ec24140aeebe9bf6c1ee022c11ba93a
-  data.tar.gz: cd25702d61748ea15b0296ff8158626031c1e11cdb44ca98ad2c389014ce867c
+  metadata.gz: 4c97979569c84fe8da4d767719bd6c578272934b7f07b143c2d1159744ddc7ae
+  data.tar.gz: ae22033749ba9ead39e5ad18cfd2c1e5c4cd331e2bb84130069554b53dada518
 SHA512:
-  metadata.gz: 9ae46bd72823ac77aed8168f6e96df224b80ee72a10a53e902ba924533933e5fccf5a3b8c7a7e6d4c5c54d87dd0d37e10f7f1f62034c1365ac0c6648a0bb698b
-  data.tar.gz: 1f99abfa263a0d4cb437371d030b4802bb3865d2032c286275ac829509136cd005587604bc09073598acf0e2d7ad1bd35850859c8f0fecd37e8e07b755afcd14
+  metadata.gz: 6c05dc897217fa33ac94c0978a8ea33c0d778fff49411fe6a7ebe5961e68df5f0a54b081721134a0875dd9dc3a2bcb7a75e22b5489889be60b74ba389f10e371
+  data.tar.gz: 58b30acc2a8c0f0d25b08ea3da002e311689b551746e966c4ab82022c3ff417d0fd80d3711b6695fd599ac100eef6f17767938d5a511cef4046455df6b0dd40b

data/History.md

@@ -2,6 +2,10 @@
 
 ### [Unreleased]
 
+### 3.2.1
+- Don't attempt to connect to Elasticsearch in dry run mode (#543)
+- Add FAQ for typhoeus gem installation (#544)
+
 ### 3.2.0
 - Split huge record requests (#539)
 

data/ISSUE_TEMPLATE.md

@@ -20,7 +20,7 @@ Provide example config and message
 * Bare Metal or within Docker or Kubernetes or others?
 * Fluentd v0.12 or v0.14/v1.0
   * paste result of ``fluentd --version`` or ``td-agent --version``
-* ES plugin 2.x.y or 1.x.y
+* ES plugin 3.x.y/2.x.y or 1.x.y
   * paste boot log of fluentd or td-agent
   * paste result of ``fluent-gem list``, ``td-agent-gem list`` or your Gemfile.lock
 * ES version (optional)

data/README.md

@@ -86,6 +86,7 @@ Current maintainers: @cosmo0920
   + [Cannot connect TLS enabled reverse Proxy](#cannot-connect-tls-enabled-reverse-proxy)
   + [Declined logs are resubmitted forever, why?](#declined-logs-are-resubmitted-forever-why)
   + [Suggested to increase flush_thread_count, why?](#suggested-to-increase-flush_thread_count-why)
+  + [Suggested to install typhoeus gem, why?](#suggested-to-install-typhoeus-gem-why)
 * [Contact](#contact)
 * [Contributing](#contributing)
 * [Running tests](#running-tests)
@@ -1272,6 +1273,25 @@ To prevent the following warning and sending events blocking, you must specify `
 </match>
 ```
 
+### Suggested to install typhoeus gem, why?
+
+fluent-plugin-elasticsearch doesn't depend on typhoeus gem by default.
+If you want to use typhoeus backend, you must install typhoeus gem by your own.
+
+If you use vanilla Fluentd, you can install it by:
+
+```
+gem install typhoeus
+```
+
+But, you use td-agent instead of vannila Fluentd, you have to use `td-agent-gem`:
+
+```
+td-agent-gem install typhoeus
+```
+
+In more detail, please refer to [the official plugin management document](https://docs.fluentd.org/v1.0/articles/plugin-management).
+
 ## Contact
 
 If you have a question, [open an Issue](https://github.com/uken/fluent-plugin-elasticsearch/issues).

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       = '3.2.0'
+  s.version       = '3.2.1'
   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.rb

@@ -173,20 +173,22 @@ EOC
 
       raise Fluent::ConfigError, "'max_retry_putting_template' must be positive number." if @max_retry_putting_template < 0
 
-      if @template_name && @template_file
-        retry_operate(@max_retry_putting_template) do
-          if @customize_template
-            if @rollover_index
-              raise Fluent::ConfigError, "'deflector_alias' must be provided if 'rollover_index' is set true ." if not @deflector_alias
+      if !Fluent::Engine.dry_run_mode
+        if @template_name && @template_file
+          retry_operate(@max_retry_putting_template) do
+            if @customize_template
+              if @rollover_index
+                raise Fluent::ConfigError, "'deflector_alias' must be provided if 'rollover_index' is set true ." if not @deflector_alias
+              end
+              template_custom_install(@template_name, @template_file, @template_overwrite, @customize_template, @index_prefix, @rollover_index, @deflector_alias, @application_name, @index_date_pattern)
+            else
+              template_install(@template_name, @template_file, @template_overwrite)
             end
-            template_custom_install(@template_name, @template_file, @template_overwrite, @customize_template, @index_prefix, @rollover_index, @deflector_alias, @application_name, @index_date_pattern)
-          else
-            template_install(@template_name, @template_file, @template_overwrite)
           end
-        end
-      elsif @templates
-        retry_operate(@max_retry_putting_template) do
-          templates_hash_install(@templates, @template_overwrite)
+        elsif @templates
+          retry_operate(@max_retry_putting_template) do
+            templates_hash_install(@templates, @template_overwrite)
+          end
         end
       end
 
@@ -232,7 +234,7 @@ EOC
       end
 
       @last_seen_major_version =
-        if @verify_es_version_at_startup
+        if @verify_es_version_at_startup && !Fluent::Engine.dry_run_mode
           retry_operate(@max_retry_get_es_version) do
             detect_es_major_version
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - diogo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd