From d86a8d4c669c2346e87090dad5ce86653d541b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Tue, 7 Jan 2020 13:40:56 +0100 Subject: [PATCH] Update autodiscover docs to add missing settings (#14865) `cleanup_timeout` and some other settings were missing. This PR adds them to the docs. (cherry picked from commit 99beb81bf3cf7b5ae005a9fc8aa95fb044945014) --- libbeat/docs/shared-autodiscover.asciidoc | 13 +++++++++++++ .../docs/add_kubernetes_metadata.asciidoc | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/libbeat/docs/shared-autodiscover.asciidoc b/libbeat/docs/shared-autodiscover.asciidoc index b8986ee9191f..9e7087e72bea 100644 --- a/libbeat/docs/shared-autodiscover.asciidoc +++ b/libbeat/docs/shared-autodiscover.asciidoc @@ -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::[] @@ -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. diff --git a/libbeat/processors/add_kubernetes_metadata/docs/add_kubernetes_metadata.asciidoc b/libbeat/processors/add_kubernetes_metadata/docs/add_kubernetes_metadata.asciidoc index 94181a44167d..be14bde859f4 100644 --- a/libbeat/processors/add_kubernetes_metadata/docs/add_kubernetes_metadata.asciidoc +++ b/libbeat/processors/add_kubernetes_metadata/docs/add_kubernetes_metadata.asciidoc @@ -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. \ No newline at end of file