diff --git a/docs/devguide/create-metricset.asciidoc b/docs/devguide/create-metricset.asciidoc
index ff32ac2d5a4..90ee6d5b05f 100644
--- a/docs/devguide/create-metricset.asciidoc
+++ b/docs/devguide/create-metricset.asciidoc
@@ -1,6 +1,8 @@
 [[creating-metricsets]]
 === Creating a Metricset
 
+include::generator-support-note.asciidoc[tag=metricset-generator]
+
 A metricset is the part of a Metricbeat module that fetches and structures the
 data from the remote service. Each module can have multiple metricsets. In this guide, you learn how to create your own metricset. If you want to create
 your own Beat that uses Metricbeat as a library, see <<creating-beat-from-metricbeat>>.
diff --git a/docs/devguide/generator-support-note.asciidoc b/docs/devguide/generator-support-note.asciidoc
new file mode 100644
index 00000000000..25579798ed2
--- /dev/null
+++ b/docs/devguide/generator-support-note.asciidoc
@@ -0,0 +1,13 @@
+// tag::metricset-generator[]
+IMPORTANT: Elastic provides no warranty or support for the code used to generate
+metricsets. The generator is mainly offered as guidance for developers who want
+to create their own data shippers.
+
+// end::metricset-generator[]
+
+// tag::filebeat-generator[]
+IMPORTANT: Elastic provides no warranty or support for the code used to generate
+modules and filesets. The generator is mainly offered as guidance for developers
+who want to create their own data shippers.
+
+// end::filebeat-generator[]
\ No newline at end of file
diff --git a/docs/devguide/modules-dev-guide.asciidoc b/docs/devguide/modules-dev-guide.asciidoc
index ead805eaed8..943daf8023e 100644
--- a/docs/devguide/modules-dev-guide.asciidoc
+++ b/docs/devguide/modules-dev-guide.asciidoc
@@ -1,6 +1,8 @@
 [[filebeat-modules-devguide]]
 == Creating a New Filebeat Module
 
+include::generator-support-note.asciidoc[tag=filebeat-generator]
+
 This guide will walk you through creating a new Filebeat module.
 
 All Filebeat modules currently live in the main