Fix duplicated module headers (#7650)

ruflin · ycombinator · commit ff45ef8e05e6 · 2018-07-23T06:46:33.000-07:00
* Fix duplicated module headers Closes #7643 * fix metricset titles for munin and kvm * fix imssing kubernetes apiserver metricset doc * remove headers from modules / metricset generator and clean up traefik title
diff --git a/metricbeat/docs/modules/kubernetes.asciidoc b/metricbeat/docs/modules/kubernetes.asciidoc
@@ -89,6 +89,8 @@ This module supports TLS connection when using `ssl` config field, as described
 
 The following metricsets are available:
 
+* <<metricbeat-metricset-kubernetes-apiserver,apiserver>>
+
 * <<metricbeat-metricset-kubernetes-container,container>>
 
 * <<metricbeat-metricset-kubernetes-event,event>>
@@ -113,6 +115,8 @@ The following metricsets are available:
 
 * <<metricbeat-metricset-kubernetes-volume,volume>>
 
+include::kubernetes/apiserver.asciidoc[]
+
 include::kubernetes/container.asciidoc[]
 
 include::kubernetes/event.asciidoc[]
diff --git a/metricbeat/docs/modules/kubernetes/apiserver.asciidoc b/metricbeat/docs/modules/kubernetes/apiserver.asciidoc
@@ -0,0 +1,17 @@
+////
+This file is generated! See scripts/docs_collector.py
+////
+
+[[metricbeat-metricset-kubernetes-apiserver]]
+=== Kubernetes apiserver metricset
+
+beta[]
+
+include::../../../module/kubernetes/apiserver/_meta/docs.asciidoc[]
+
+
+==== Fields
+
+For a description of each field in the metricset, see the
+<<exported-fields-kubernetes,exported fields>> section.
+
diff --git a/metricbeat/docs/modules/kvm.asciidoc b/metricbeat/docs/modules/kvm.asciidoc
@@ -7,8 +7,6 @@ This file is generated! See scripts/docs_collector.py
 
 experimental[]
 
-== kvm module
-
 This is the kvm module.
 
 
diff --git a/metricbeat/docs/modules/munin.asciidoc b/metricbeat/docs/modules/munin.asciidoc
@@ -7,8 +7,6 @@ This file is generated! See scripts/docs_collector.py
 
 experimental[]
 
-== munin module
-
 This is the munin module.
 
 The default metricset is `node`.
diff --git a/metricbeat/docs/modules/uwsgi.asciidoc b/metricbeat/docs/modules/uwsgi.asciidoc
@@ -7,8 +7,6 @@ This file is generated! See scripts/docs_collector.py
 
 beta[]
 
-== uwsgi module
-
 This is the uwsgi module. By default collects the `stats` metricset, using
 http://uwsgi-docs.readthedocs.io/en/latest/StatsServer.html[StatsServer].
 
diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -65,7 +65,8 @@ This file is generated! See scripts/docs_collector.py
 .2+| .2+|  |<<metricbeat-metricset-kibana-stats,stats>> beta[]  
 |<<metricbeat-metricset-kibana-status,status>> beta[]  
 |<<metricbeat-module-kubernetes,Kubernetes>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.12+| .12+|  |<<metricbeat-metricset-kubernetes-container,container>>   
+.13+| .13+|  |<<metricbeat-metricset-kubernetes-apiserver,apiserver>> beta[]  
+|<<metricbeat-metricset-kubernetes-container,container>>   
 |<<metricbeat-metricset-kubernetes-event,event>> beta[]  
 |<<metricbeat-metricset-kubernetes-node,node>>   
 |<<metricbeat-metricset-kubernetes-pod,pod>>   
diff --git a/metricbeat/module/kubernetes/apiserver/_meta/docs.asciidoc b/metricbeat/module/kubernetes/apiserver/_meta/docs.asciidoc
@@ -0,0 +1 @@
+This is the `apiserver` metricset of the Kubernetes module.
diff --git a/metricbeat/module/kvm/_meta/docs.asciidoc b/metricbeat/module/kvm/_meta/docs.asciidoc
@@ -1,4 +1,2 @@
-== kvm module
-
 This is the kvm module.
 
diff --git a/metricbeat/module/kvm/dommemstat/_meta/docs.asciidoc b/metricbeat/module/kvm/dommemstat/_meta/docs.asciidoc
@@ -1,3 +1 @@
-=== kvm dommemstat MetricSet
-
 This is the dommemstat metricset of the module kvm.
diff --git a/metricbeat/module/munin/_meta/docs.asciidoc b/metricbeat/module/munin/_meta/docs.asciidoc
@@ -1,5 +1,3 @@
-== munin module
-
 This is the munin module.
 
 The default metricset is `node`.
diff --git a/metricbeat/module/munin/node/_meta/docs.asciidoc b/metricbeat/module/munin/node/_meta/docs.asciidoc
@@ -1,5 +1,3 @@
-=== munin node MetricSet
-
 This is the node metricset of the module munin.
 
 [float]
diff --git a/metricbeat/module/traefik/health/_meta/docs.asciidoc b/metricbeat/module/traefik/health/_meta/docs.asciidoc
@@ -1,3 +1 @@
-=== traefik health MetricSet
-
 This is the health metricset of the module traefik.
diff --git a/metricbeat/module/uwsgi/_meta/docs.asciidoc b/metricbeat/module/uwsgi/_meta/docs.asciidoc
@@ -1,5 +1,3 @@
-== uwsgi module
-
 This is the uwsgi module. By default collects the `stats` metricset, using
 http://uwsgi-docs.readthedocs.io/en/latest/StatsServer.html[StatsServer].
 
diff --git a/metricbeat/scripts/module/docs.asciidoc b/metricbeat/scripts/module/docs.asciidoc
@@ -1,4 +1,2 @@
-== {module} module
-
 This is the {module} module.
 
diff --git a/metricbeat/scripts/module/metricset/docs.asciidoc b/metricbeat/scripts/module/metricset/docs.asciidoc
@@ -1,3 +1 @@
-=== {module} {metricset} MetricSet
-
 This is the {metricset} metricset of the module {module}.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+This is the `apiserver` metricset of the Kubernetes module.
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,2 @@`
`1`		`-== kvm module`
`2`		`-`
`3`	`1`	`This is the kvm module.`
`4`	`2`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1 @@`
`1`		`-=== kvm dommemstat MetricSet`
`2`		`-`
`3`	`1`	`This is the dommemstat metricset of the module kvm.`