logstash-output-elasticsearch 10.6.0-java → 10.6.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69cd4a7aaa5a5b66bc94d633f1e482f472a557a464f0077e1382fe3b8d8bf6a4
-  data.tar.gz: 3b08e4236f1ba8d580a4f35b528400a3c3a3e0b33123ca9e5d0b983cdb6a256d
+  metadata.gz: 712190af3d33e9433c9f6b6dd8efa85406b28e1dddaf344bcaa1c5769708bd44
+  data.tar.gz: 860e97c8f49c09bb0659939211843cc2799e69feccfb58d4584144a067e6b43f
 SHA512:
-  metadata.gz: 5acda5b8b7a8654f0a8ffd9c99483f25eb7076184d018a76615e7d88861a45c898a6f1d20a80396791f8e6ec53746d716705ebde4db7d60b258b17941bb073b9
-  data.tar.gz: 9927d71a573cf5aee344d8d8e0f8c7808b4e98769a1a35ae83ac25186439326f9ffa9910c676aec567607da3b9cb8bb26570fb5dd662c1ca62f648288230acb5
+  metadata.gz: 2aa2d08a6bdf2248091afb58fe46d79f5144a07ff2512aa6ba3511242037da6577cefae0e0da7278bab13e1382abda215dee081154eec79d75604f8f4a054386
+  data.tar.gz: ebeb646959ce0baf384036dfd34c035a13f88deded066d9557c3d13770dfeb37a241385ab4612f702a4e850fb835903cddc81ed28445e799a2f9d8ce81b50e0c

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 10.6.1
+ - Fixed an issue introduced in 10.6.0 that broke Logstash Core's monitoring feature when this plugin is run in Logstash 7.7-7.8. [#953](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/953)
+
 ## 10.6.0
  - Added `ecs_compatiblity` mode, for managing ECS-compatable templates [#952](https://github.com/logstash-plugins/logstash-output-elasticsearch/issue/952)
 

data/docs/index.asciidoc

@@ -419,7 +419,7 @@ If you don't set a value for this option:
 ** When Logstash provides a `pipeline.ecs_compatibility` setting, its value is used as the default
 ** Otherwise, the default value is `disabled`.
 
-Controls this plugin's compatibility with the {ecs-ref}}[Elastic Common Schema (ECS)],
+Controls this plugin's compatibility with the https://www.elastic.co/guide/en/ecs/current/index.html[Elastic Common Schema (ECS)],
 including the installation of ECS-compatible index templates.
 The value of this setting affects the _default_ values of:
 

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

@@ -60,7 +60,14 @@ module LogStash; module Outputs; class ElasticSearch;
       !!maximum_seen_major_version
     end
 
-    def use_event_type?
+    ##
+    # WARNING: This method is overridden in a subclass in Logstash Core 7.7-7.8's monitoring,
+    #          where a `client` argument is both required and ignored. In later versions of
+    #          Logstash Core it is optional and ignored, but to make it optional here would
+    #          allow us to accidentally break compatibility with Logstashes where it was required.
+    # @param noop_required_client [nil]: required `nil` for legacy reasons.
+    # @return [Boolean]
+    def use_event_type?(noop_required_client)
       maximum_seen_major_version < 8
     end
 
@@ -74,7 +81,7 @@ module LogStash; module Outputs; class ElasticSearch;
         routing_field_name => @routing ? event.sprintf(@routing) : nil
       }
 
-      params[:_type] = get_event_type(event) if use_event_type?
+      params[:_type] = get_event_type(event) if use_event_type?(nil)
 
       if @pipeline
         params[:pipeline] = event.sprintf(@pipeline)

data/logstash-output-elasticsearch.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '10.6.0'
+  s.version         = '10.6.1'
 
   s.licenses        = ['apache-2.0']
   s.summary         = "Stores logs in Elasticsearch"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 10.6.0
+  version: 10.6.1
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement