Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix duplicated module headers #7650

Merged
merged 4 commits into from
Jul 23, 2018
Merged

Fix duplicated module headers #7650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
958bd0f
Fix duplicated module headers
ruflin Jul 20, 2018
b5ee641
fix metricset titles for munin and kvm
ruflin Jul 20, 2018
5574c77
fix imssing kubernetes apiserver metricset doc
ruflin Jul 20, 2018
be1ff3a
remove headers from modules / metricset generator and clean up traefi…
ruflin Jul 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions metricbeat/docs/modules/kubernetes.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>>
Expand All @@ -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[]
Expand Down
17 changes: 17 additions & 0 deletions metricbeat/docs/modules/kubernetes/apiserver.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

2 changes: 0 additions & 2 deletions metricbeat/docs/modules/kvm.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ This file is generated! See scripts/docs_collector.py

experimental[]

== kvm module

This is the kvm module.


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/munin.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/uwsgi.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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].

Expand Down
3 changes: 2 additions & 1 deletion metricbeat/docs/modules_list.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>>
Expand Down
1 change: 1 addition & 0 deletions metricbeat/module/kubernetes/apiserver/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is the `apiserver` metricset of the Kubernetes module.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@exekias I wonder if you left this out on purpose?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably not, 👍 to having it

2 changes: 0 additions & 2 deletions metricbeat/module/kvm/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
== kvm module

This is the kvm module.

2 changes: 0 additions & 2 deletions metricbeat/module/kvm/dommemstat/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
=== kvm dommemstat MetricSet

This is the dommemstat metricset of the module kvm.
2 changes: 0 additions & 2 deletions metricbeat/module/munin/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
== munin module

This is the munin module.

The default metricset is `node`.
2 changes: 0 additions & 2 deletions metricbeat/module/munin/node/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
=== munin node MetricSet

This is the node metricset of the module munin.

[float]
Expand Down
2 changes: 0 additions & 2 deletions metricbeat/module/traefik/health/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
=== traefik health MetricSet

This is the health metricset of the module traefik.
2 changes: 0 additions & 2 deletions metricbeat/module/uwsgi/_meta/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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].

Expand Down
2 changes: 0 additions & 2 deletions metricbeat/scripts/module/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
== {module} module

This is the {module} module.

2 changes: 0 additions & 2 deletions metricbeat/scripts/module/metricset/docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
=== {module} {metricset} MetricSet

This is the {metricset} metricset of the module {module}.