diff --git a/docs/reference/monitoring/index.asciidoc b/docs/reference/monitoring/index.asciidoc
index 187415b59827..68da2c8dcdad 100644
--- a/docs/reference/monitoring/index.asciidoc
+++ b/docs/reference/monitoring/index.asciidoc
@@ -39,4 +39,3 @@ include::local-export.asciidoc[]
include::http-export.asciidoc[]
include::pause-export.asciidoc[]
-include::troubleshooting.asciidoc[]
diff --git a/docs/reference/monitoring/troubleshooting.asciidoc b/docs/reference/monitoring/troubleshooting.asciidoc
index 120e80083b80..f2823c8a4108 100644
--- a/docs/reference/monitoring/troubleshooting.asciidoc
+++ b/docs/reference/monitoring/troubleshooting.asciidoc
@@ -1,9 +1,5 @@
[[monitoring-troubleshooting]]
== Troubleshooting monitoring
-++++
-Troubleshooting
-++++
-
Use the information in this section to troubleshoot common problems and find
answers for frequently asked questions. See also
{logstash-ref}/monitoring-troubleshooting.html[Troubleshooting monitoring in {ls}].
diff --git a/docs/reference/transform/index.asciidoc b/docs/reference/transform/index.asciidoc
index 99c1cde98e38..d6d9c6030dab 100644
--- a/docs/reference/transform/index.asciidoc
+++ b/docs/reference/transform/index.asciidoc
@@ -9,5 +9,4 @@ include::api-quickref.asciidoc[leveloffset=+2]
include::ecommerce-tutorial.asciidoc[leveloffset=+2]
include::examples.asciidoc[leveloffset=+2]
include::painless-examples.asciidoc[leveloffset=+2]
-include::troubleshooting.asciidoc[leveloffset=+2]
include::limitations.asciidoc[leveloffset=+2]
\ No newline at end of file
diff --git a/docs/reference/transform/troubleshooting.asciidoc b/docs/reference/transform/troubleshooting.asciidoc
index 24d808ed0dae..24abed46048f 100644
--- a/docs/reference/transform/troubleshooting.asciidoc
+++ b/docs/reference/transform/troubleshooting.asciidoc
@@ -2,9 +2,6 @@
[[transform-troubleshooting]]
= Troubleshooting {transforms}
[subs="attributes"]
-++++
-Troubleshooting
-++++
Use the information in this section to troubleshoot common problems.
diff --git a/docs/reference/troubleshooting.asciidoc b/docs/reference/troubleshooting.asciidoc
index 5e4c1f891078..4cb5f6ce36c1 100644
--- a/docs/reference/troubleshooting.asciidoc
+++ b/docs/reference/troubleshooting.asciidoc
@@ -3,11 +3,35 @@
[partintro]
--
-This section provides a series of troubleshooting guides aimed at helping users
-fix problems an Elasticsearch deployment might encounter.
+This section provides a series of troubleshooting solutions aimed at helping users
+fix problems that an {es} deployment might encounter.
-Reporting and diagnosing the problems presented in this section is assisted
-by the <>.
+Several troubleshooting issues can be diagnosed using the
+<>.
+
+If none of these solutions relate to your issue, you can still get help:
+
+* For users with an active subscription, you can get help in several ways:
+
+** Go directly to the http://support.elastic.co[Support Portal]
+
+** From the {ess} Console, go to the
+ https://cloud.elastic.co/support{ess-baymax}[Support page], or select the
+ support icon that looks like a life preserver on any page.
+
+** Contact us by email: support@elastic.co
++
+[TIP]
+====
+If you contact us by email, use the email address that you registered with so
+that we can help you more quickly. If you are using a distribution list as your
+registered email, you can also register a second email address with us. Just
+open a case to let us know the name and email address you want to add.
+====
+
+* For users without an active subscription, visit the
+https://discuss.elastic.co/[Elastic community forums] and get answers from
+the experts in the community, including people from Elastic.
--
include::troubleshooting/data/increase-shard-limit.asciidoc[]
@@ -21,3 +45,9 @@ include::troubleshooting/data/enable-cluster-allocation.asciidoc[]
include::troubleshooting/data/data-tiers-mixed-with-node-attr.asciidoc[]
include::troubleshooting/data/diagnose-unassigned-shards.asciidoc[]
+
+include::monitoring/troubleshooting.asciidoc[]
+
+include::transform/troubleshooting.asciidoc[leveloffset=+1]
+
+include::../../x-pack/docs/en/watcher/troubleshooting.asciidoc[]
diff --git a/x-pack/docs/en/watcher/index.asciidoc b/x-pack/docs/en/watcher/index.asciidoc
index 53eed8f2262b..8f276ce40a5d 100644
--- a/x-pack/docs/en/watcher/index.asciidoc
+++ b/x-pack/docs/en/watcher/index.asciidoc
@@ -91,6 +91,4 @@ include::managing-watches.asciidoc[]
include::example-watches.asciidoc[]
-include::troubleshooting.asciidoc[]
-
include::limitations.asciidoc[]
diff --git a/x-pack/docs/en/watcher/troubleshooting.asciidoc b/x-pack/docs/en/watcher/troubleshooting.asciidoc
index 9dacad150606..5b9a25c63c46 100644
--- a/x-pack/docs/en/watcher/troubleshooting.asciidoc
+++ b/x-pack/docs/en/watcher/troubleshooting.asciidoc
@@ -2,9 +2,6 @@
[[watcher-troubleshooting]]
== Troubleshooting {watcher}
[subs="attributes"]
-++++
-Troubleshooting
-++++
[discrete]
=== Dynamic mapping error when trying to add a watch