Skip to content

Commit

Permalink
Rename kubelet -> kubernetes
Browse files Browse the repository at this point in the history
  • Loading branch information
exekias committed May 2, 2017
1 parent 5e2f0af commit 9d73b91
Show file tree
Hide file tree
Showing 71 changed files with 369 additions and 420 deletions.
239 changes: 103 additions & 136 deletions metricbeat/docs/fields.asciidoc

Large diffs are not rendered by default.

54 changes: 0 additions & 54 deletions metricbeat/docs/modules/kubelet.asciidoc

This file was deleted.

19 changes: 0 additions & 19 deletions metricbeat/docs/modules/kubelet/container.asciidoc

This file was deleted.

19 changes: 0 additions & 19 deletions metricbeat/docs/modules/kubelet/system.asciidoc

This file was deleted.

19 changes: 0 additions & 19 deletions metricbeat/docs/modules/kubelet/volume.asciidoc

This file was deleted.

54 changes: 54 additions & 0 deletions metricbeat/docs/modules/kubernetes.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
////
This file is generated! See scripts/docs_collector.py
////

[[metricbeat-module-kubernetes]]
== kubernetes Module

beta[]

This module fetches metrics from Kubernetes https://kubernetes.io/docs/admin/kubelet/[kubelet] agent.


[float]
=== Example Configuration

The kubernetes module supports the standard configuration options that are described
in <<configuration-metricbeat>>. Here is an example configuration:

[source,yaml]
----
metricbeat.modules:
- module: kubernetes
metricsets: ["node","container","volume","pod","system"]
enabled: false
period: 10s
hosts: ["localhost:10255"]
----

[float]
=== Metricsets

The following metricsets are available:

* <<metricbeat-metricset-kubernetes-container,container>>

* <<metricbeat-metricset-kubernetes-node,node>>

* <<metricbeat-metricset-kubernetes-pod,pod>>

* <<metricbeat-metricset-kubernetes-system,system>>

* <<metricbeat-metricset-kubernetes-volume,volume>>

include::kubernetes/container.asciidoc[]

include::kubernetes/node.asciidoc[]

include::kubernetes/pod.asciidoc[]

include::kubernetes/system.asciidoc[]

include::kubernetes/volume.asciidoc[]

19 changes: 19 additions & 0 deletions metricbeat/docs/modules/kubernetes/container.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
////
This file is generated! See scripts/docs_collector.py
////

[[metricbeat-metricset-kubernetes-container]]
include::../../../module/kubernetes/container/_meta/docs.asciidoc[]


==== Fields

For a description of each field in the metricset, see the
<<exported-fields-kubernetes,exported fields>> section.

Here is an example document generated by this metricset:

[source,json]
----
include::../../../module/kubernetes/container/_meta/data.json[]
----
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
This file is generated! See scripts/docs_collector.py
////

[[metricbeat-metricset-kubelet-node]]
include::../../../module/kubelet/node/_meta/docs.asciidoc[]
[[metricbeat-metricset-kubernetes-node]]
include::../../../module/kubernetes/node/_meta/docs.asciidoc[]


==== Fields

For a description of each field in the metricset, see the
<<exported-fields-kubelet,exported fields>> section.
<<exported-fields-kubernetes,exported fields>> section.

Here is an example document generated by this metricset:

[source,json]
----
include::../../../module/kubelet/node/_meta/data.json[]
include::../../../module/kubernetes/node/_meta/data.json[]
----
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
This file is generated! See scripts/docs_collector.py
////

[[metricbeat-metricset-kubelet-pod]]
include::../../../module/kubelet/pod/_meta/docs.asciidoc[]
[[metricbeat-metricset-kubernetes-pod]]
include::../../../module/kubernetes/pod/_meta/docs.asciidoc[]


==== Fields

For a description of each field in the metricset, see the
<<exported-fields-kubelet,exported fields>> section.
<<exported-fields-kubernetes,exported fields>> section.

Here is an example document generated by this metricset:

[source,json]
----
include::../../../module/kubelet/pod/_meta/data.json[]
include::../../../module/kubernetes/pod/_meta/data.json[]
----
19 changes: 19 additions & 0 deletions metricbeat/docs/modules/kubernetes/system.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
////
This file is generated! See scripts/docs_collector.py
////

[[metricbeat-metricset-kubernetes-system]]
include::../../../module/kubernetes/system/_meta/docs.asciidoc[]


==== Fields

For a description of each field in the metricset, see the
<<exported-fields-kubernetes,exported fields>> section.

Here is an example document generated by this metricset:

[source,json]
----
include::../../../module/kubernetes/system/_meta/data.json[]
----
19 changes: 19 additions & 0 deletions metricbeat/docs/modules/kubernetes/volume.asciidoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
////
This file is generated! See scripts/docs_collector.py
////

[[metricbeat-metricset-kubernetes-volume]]
include::../../../module/kubernetes/volume/_meta/docs.asciidoc[]


==== Fields

For a description of each field in the metricset, see the
<<exported-fields-kubernetes,exported fields>> section.

Here is an example document generated by this metricset:

[source,json]
----
include::../../../module/kubernetes/volume/_meta/data.json[]
----
4 changes: 2 additions & 2 deletions metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ This file is generated! See scripts/docs_collector.py
* <<metricbeat-module-jolokia,Jolokia>>
* <<metricbeat-module-kafka,kafka>>
* <<metricbeat-module-kibana,kibana>>
* <<metricbeat-module-kubelet,kubelet>>
* <<metricbeat-module-kubernetes,kubernetes>>
* <<metricbeat-module-memcached,memcached>>
* <<metricbeat-module-mongodb,MongoDB>>
* <<metricbeat-module-mysql,MySQL>>
Expand Down Expand Up @@ -42,7 +42,7 @@ include::modules/http.asciidoc[]
include::modules/jolokia.asciidoc[]
include::modules/kafka.asciidoc[]
include::modules/kibana.asciidoc[]
include::modules/kubelet.asciidoc[]
include::modules/kubernetes.asciidoc[]
include::modules/memcached.asciidoc[]
include::modules/mongodb.asciidoc[]
include::modules/mysql.asciidoc[]
Expand Down
12 changes: 6 additions & 6 deletions metricbeat/include/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ import (
_ "github.com/elastic/beats/metricbeat/module/kafka/partition"
_ "github.com/elastic/beats/metricbeat/module/kibana"
_ "github.com/elastic/beats/metricbeat/module/kibana/status"
_ "github.com/elastic/beats/metricbeat/module/kubelet"
_ "github.com/elastic/beats/metricbeat/module/kubelet/container"
_ "github.com/elastic/beats/metricbeat/module/kubelet/node"
_ "github.com/elastic/beats/metricbeat/module/kubelet/pod"
_ "github.com/elastic/beats/metricbeat/module/kubelet/system"
_ "github.com/elastic/beats/metricbeat/module/kubelet/volume"
_ "github.com/elastic/beats/metricbeat/module/kubernetes"
_ "github.com/elastic/beats/metricbeat/module/kubernetes/container"
_ "github.com/elastic/beats/metricbeat/module/kubernetes/node"
_ "github.com/elastic/beats/metricbeat/module/kubernetes/pod"
_ "github.com/elastic/beats/metricbeat/module/kubernetes/system"
_ "github.com/elastic/beats/metricbeat/module/kubernetes/volume"
_ "github.com/elastic/beats/metricbeat/module/memcached"
_ "github.com/elastic/beats/metricbeat/module/memcached/stats"
_ "github.com/elastic/beats/metricbeat/module/mongodb"
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/metricbeat.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ metricbeat.modules:
period: 10s
hosts: ["localhost:5601"]

#------------------------------- kubelet Module ------------------------------
- module: kubelet
#----------------------------- kubernetes Module -----------------------------
- module: kubernetes
metricsets: ["node","container","volume","pod","system"]
enabled: false
period: 10s
Expand Down
17 changes: 0 additions & 17 deletions metricbeat/module/kubelet/_meta/fields.yml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 9d73b91

Please sign in to comment.