diff --git a/metricbeat/docs/modules/kubernetes.asciidoc b/metricbeat/docs/modules/kubernetes.asciidoc index e4ad4491109..d2398036c8d 100644 --- 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: +* <> + * <> * <> @@ -113,6 +115,8 @@ The following metricsets are available: * <> +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 new file mode 100644 index 00000000000..f32fa961bdd --- /dev/null +++ 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 +<> section. + diff --git a/metricbeat/docs/modules/kvm.asciidoc b/metricbeat/docs/modules/kvm.asciidoc index 0aec7ec7ab4..b5acf8877dc 100644 --- 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 index 517211e0682..0622fe3405f 100644 --- 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 index bb8df6c8582..2f102716b83 100644 --- 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 index 015bea036d5..81d18c8b380 100644 --- 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+| |<> beta[] |<> beta[] |<> |image:./images/icon-yes.png[Prebuilt dashboards are available] | -.12+| .12+| |<> +.13+| .13+| |<> beta[] +|<> |<> beta[] |<> |<> diff --git a/metricbeat/module/kubernetes/apiserver/_meta/docs.asciidoc b/metricbeat/module/kubernetes/apiserver/_meta/docs.asciidoc new file mode 100644 index 00000000000..bc9e31737a4 --- /dev/null +++ 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 index b4d11cbf9f0..99141215f11 100644 --- 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 index 9b34db197dd..89e2dfff5d9 100644 --- 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 index d7e009b4c28..d4148381d2e 100644 --- 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 index a20a538c746..403f5fa93b9 100644 --- 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 index e94ed71f3fb..2a1cace1864 100644 --- 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 index af53032206e..89c89dc533a 100644 --- 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 index 3447dd2758a..447c150bb22 100644 --- 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 index 1334c28ab76..9be9dece382 100644 --- 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}.