From a423bcd18902738655bfc11ecd072c440854ba0e Mon Sep 17 00:00:00 2001
From: Karen Metts <karen.metts@elastic.co>
Date: Mon, 7 Oct 2019 17:44:34 -0400
Subject: [PATCH 1/3] Add note about _type setting change

---
 docs/index.asciidoc | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/index.asciidoc b/docs/index.asciidoc
index e99f17e4f..e93b73e83 100644
--- a/docs/index.asciidoc
+++ b/docs/index.asciidoc
@@ -21,6 +21,21 @@ include::{include_path}/plugin_header.asciidoc[]
 
 ==== Description
 
+.Compatibility Note
+[NOTE]
+================================================================================
+The `_type` setting changed from `doc` to `_doc` in Elasticsearch 7.0.
+
+If you are using an earlier version of Logstash, upgrade to
+version 6.8 to pick up changes to the Elasticsearch index template before you
+upgrade to version 7.0 (or later). 
+
+After upgrading to 6.8, use the {ref}/indices-templates.html#getting[Index
+Template API] to verify that the 6.8 index template has been created in
+Elasticsearch.
+
+================================================================================
+
 .Compatibility Note
 [NOTE]
 ================================================================================

From 4b4606ec478ce22a402d1065da4286a301f592f3 Mon Sep 17 00:00:00 2001
From: Karen Metts <35154725+karenzone@users.noreply.github.com>
Date: Thu, 26 Mar 2020 12:30:54 -0400
Subject: [PATCH 2/3] Update docs/index.asciidoc

Co-Authored-By: Ry Biesemeyer <yaauie@users.noreply.github.com>
---
 docs/index.asciidoc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/index.asciidoc b/docs/index.asciidoc
index e93b73e83..181944373 100644
--- a/docs/index.asciidoc
+++ b/docs/index.asciidoc
@@ -24,16 +24,16 @@ include::{include_path}/plugin_header.asciidoc[]
 .Compatibility Note
 [NOTE]
 ================================================================================
-The `_type` setting changed from `doc` to `_doc` in Elasticsearch 7.0.
+When connected to Elasticsearch 7.x, modern versions of this plugin
+use the required `_doc` document-type when inserting documents.
 
-If you are using an earlier version of Logstash, upgrade to
-version 6.8 to pick up changes to the Elasticsearch index template before you
-upgrade to version 7.0 (or later). 
-
-After upgrading to 6.8, use the {ref}/indices-templates.html#getting[Index
-Template API] to verify that the 6.8 index template has been created in
-Elasticsearch.
+If you are using an earlier version of Logstash and wish to connect to
+Elasticsearch 7.x, first upgrade Logstash to version 6.8 to ensure it
+picks up changes to the Elasticsearch index template.
 
+If you are using a custom <<plugins-{type}s-{plugin}-template>>,
+ensure your template uses the `_doc` document-type before
+connecting to Elasticsearch 7.x.
 ================================================================================
 
 .Compatibility Note

From 29b5f9a96018cb65d9a1c86a36bf20adac3ae3c4 Mon Sep 17 00:00:00 2001
From: Karen Metts <karen.metts@elastic.co>
Date: Thu, 26 Mar 2020 12:50:58 -0400
Subject: [PATCH 3/3] Bump to v.10.4.1

---
 CHANGELOG.md                          | 3 +++
 logstash-output-elasticsearch.gemspec | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d25130dad..6fd941122 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 10.4.1
+ - [DOC] Added note about `_type` setting change from `doc` to `_doc` [#884](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/884)
+
 ## 10.4.0
  - Fixed default index value [#927](https://github.com/logstash-plugins/logstash-output-elasticsearch/pull/927)
 
diff --git a/logstash-output-elasticsearch.gemspec b/logstash-output-elasticsearch.gemspec
index 4fb10e128..364234628 100644
--- a/logstash-output-elasticsearch.gemspec
+++ b/logstash-output-elasticsearch.gemspec
@@ -1,6 +1,7 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-output-elasticsearch'
-  s.version         = '10.4.0'
+  s.version         = '10.4.1'
+
   s.licenses        = ['apache-2.0']
   s.summary         = "Stores logs in Elasticsearch"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"