elastic · sayden · Apr 27, 2021 · Aug 14, 2020 · Aug 18, 2020 · Sep 23, 2020
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
diff --git a/metricbeat/docs/modules/elasticsearch/index.asciidoc b/metricbeat/docs/modules/elasticsearch/index.asciidoc
@@ -7,6 +7,7 @@ This file is generated! See scripts/mage/docs_collector.go
 
 include::../../../module/elasticsearch/index/_meta/docs.asciidoc[]
 
+This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.
 
 ==== Fields
 

diff --git a/metricbeat/docs/modules/kibana.asciidoc b/metricbeat/docs/modules/kibana.asciidoc
@@ -55,10 +55,14 @@ It also supports the options described in <<module-http-config-options>>.
 
 The following metricsets are available:
 
+* <<metricbeat-metricset-kibana-settings,settings>>
+
 * <<metricbeat-metricset-kibana-stats,stats>>
 
 * <<metricbeat-metricset-kibana-status,status>>
 
+include::kibana/settings.asciidoc[]
+
 include::kibana/stats.asciidoc[]
 
 include::kibana/status.asciidoc[]

diff --git a/metricbeat/docs/modules/kibana/settings.asciidoc b/metricbeat/docs/modules/kibana/settings.asciidoc
@@ -0,0 +1,21 @@
+////
+This file is generated! See scripts/mage/docs_collector.go
+////
+
+[[metricbeat-metricset-kibana-settings]]
+=== Kibana settings metricset
+
+include::../../../module/kibana/settings/_meta/docs.asciidoc[]
+
+
+==== Fields
+
+For a description of each field in the metricset, see the
+<<exported-fields-kibana,exported fields>> section.
+
+Here is an example document generated by this metricset:
+
+[source,json]
+----
+include::../../../module/kibana/settings/_meta/data.json[]
+----
diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -151,7 +151,8 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-metricset-kafka-partition,partition>>   
 |<<metricbeat-metricset-kafka-producer,producer>> beta[]  
 |<<metricbeat-module-kibana,Kibana>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
-.2+| .2+|  |<<metricbeat-metricset-kibana-stats,stats>>   
+.3+| .3+|  |<<metricbeat-metricset-kibana-settings,settings>>   
+|<<metricbeat-metricset-kibana-stats,stats>>   
 |<<metricbeat-metricset-kibana-status,status>>   
 |<<metricbeat-module-kubernetes,Kubernetes>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .22+| .22+|  |<<metricbeat-metricset-kubernetes-apiserver,apiserver>>   

diff --git a/metricbeat/helper/elastic/elastic.go b/metricbeat/helper/elastic/elastic.go
@@ -95,7 +95,7 @@ func ReportErrorForMissingField(field string, product Product, r mb.ReporterV2)
 // MakeErrorForMissingField returns an error message for the given field being missing in an API
 // response received from a given product
 func MakeErrorForMissingField(field string, product Product) error {
-	return fmt.Errorf("Could not find field '%v' in %v stats API response", field, strings.Title(product.String()))
+	return fmt.Errorf("Could not find field '%v' in %v API response", field, strings.Title(product.String()))
 }
 
 // IsFeatureAvailable returns whether a feature is available in the current product version

diff --git a/metricbeat/helper/elastic/elastic_test.go b/metricbeat/helper/elastic/elastic_test.go
@@ -86,7 +86,7 @@ func TestReportErrorForMissingField(t *testing.T) {
 	r := MockReporterV2{}
 	err := ReportErrorForMissingField(field, Elasticsearch, r)
 
-	expectedError := fmt.Errorf("Could not find field '%v' in Elasticsearch stats API response", field)
+	expectedError := fmt.Errorf("Could not find field '%v' in Elasticsearch API response", field)
 	assert.Equal(t, expectedError, err)
 	assert.Equal(t, expectedError, currentErr)
 }

diff --git a/metricbeat/include/list_common.go b/metricbeat/include/list_common.go