Skip to content

Commit

Permalink
Update autodiscover docs to add missing settings (#14865) (#16510)
Browse files Browse the repository at this point in the history
`cleanup_timeout` and some other settings were missing. This PR adds
them to the docs.

(cherry picked from commit 99beb81)
  • Loading branch information
Carlos Pérez-Aradros Herce authored Feb 28, 2020
1 parent 0c89804 commit 7f76ebd
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
13 changes: 13 additions & 0 deletions libbeat/docs/shared-autodiscover.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,17 @@ autodiscover.providers:
- "/mnt/logs/${data.docker.container.id}/*.log"
-------------------------------------------------------------------------------------
It has the following settings:
`host`:: (Optional) Docker socket (UNIX or TCP socket). It uses
`unix:///var/run/docker.sock` by default.
`ssl`:: (Optional) SSL configuration to use when connecting to the Docker
socket.
`cleanup_timeout`:: (Optional) Specify the time of inactivity before stopping the
running configuration for a container, 60s by default.
`labels.dedot`:: (Optional) Default to be false. If set to true, replace dots in
labels with `_`.
=======================================
endif::[]

Expand Down Expand Up @@ -204,6 +215,8 @@ The `kubernetes` autodiscover provider has the following configuration settings:
metadata. If it is not set, the processor collects metadata from all
namespaces. It is unset by default. The namespace configuration only applies to
kubernetes resources that are namespace scoped.
`cleanup_timeout`:: (Optional) Specify the time of inactivity before stopping the
running configuration for a container, 60s by default.
`kube_config`:: (Optional) Use given config file as configuration for Kubernetes
client. If kube_config is not set, KUBECONFIG environment variable will be
checked and if not present it will fall back to InCluster.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,4 @@ client. It defaults to `KUBECONFIG` environment variable if present.
`default_indexers.enabled`:: (Optional) Enable/Disable default pod indexers, in
case you want to specify your own.
`default_matchers.enabled`:: (Optional) Enable/Disable default pod matchers, in
case you want to specify your own.
case you want to specify your own.

0 comments on commit 7f76ebd

Please sign in to comment.