From 0127bfe039ee9b6c912fed8b187db1a4d32687f5 Mon Sep 17 00:00:00 2001 From: chrismark Date: Wed, 11 Dec 2019 17:11:26 +0200 Subject: [PATCH 1/3] Update docs Signed-off-by: chrismark --- libbeat/docs/shared-autodiscover.asciidoc | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/libbeat/docs/shared-autodiscover.asciidoc b/libbeat/docs/shared-autodiscover.asciidoc index ef1602ac1b2..bd3c43b51d9 100644 --- a/libbeat/docs/shared-autodiscover.asciidoc +++ b/libbeat/docs/shared-autodiscover.asciidoc @@ -116,21 +116,35 @@ endif::[] [float] ===== Kubernetes -The Kubernetes autodiscover provider watches for Kubernetes pods to start, update, and stop. +The Kubernetes autodiscover provider watches for Kubernetes nodes, pods, services to start, update, and stop. These are the available fields during within config templating. The `kubernetes.*` fields will be available on each emitted event. +====== Generic fields: * host * port (if exposed) + * kubernetes.labels + * kubernetes.annotations + +====== Pod spesific: * kubernetes.container.id * kubernetes.container.image * kubernetes.container.name - * kubernetes.labels * kubernetes.namespace * kubernetes.node.name * kubernetes.pod.name * kubernetes.pod.uid +====== Node spesific: + * kubernetes.node.name + * kubernetes.node.uid + +====== Service spesific: + * kubernetes.namespace + * kubernetes.service.name + * kubernetes.service.uid + * kubernetes.annotations + If the `include_annotations` config is added to the provider config, then the list of annotations present in the config are added to the event. From 27a019ba69d8eb79c8ea27f99fb9aeadbaa58a25 Mon Sep 17 00:00:00 2001 From: chrismark Date: Mon, 16 Dec 2019 12:10:13 +0200 Subject: [PATCH 2/3] fixes Signed-off-by: chrismark --- libbeat/docs/shared-autodiscover.asciidoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libbeat/docs/shared-autodiscover.asciidoc b/libbeat/docs/shared-autodiscover.asciidoc index bd3c43b51d9..fc85a87502f 100644 --- a/libbeat/docs/shared-autodiscover.asciidoc +++ b/libbeat/docs/shared-autodiscover.asciidoc @@ -126,7 +126,7 @@ These are the available fields during within config templating. The `kubernetes. * kubernetes.labels * kubernetes.annotations -====== Pod spesific: +====== Pod specific: * kubernetes.container.id * kubernetes.container.image * kubernetes.container.name @@ -135,11 +135,11 @@ These are the available fields during within config templating. The `kubernetes. * kubernetes.pod.name * kubernetes.pod.uid -====== Node spesific: +====== Node specific: * kubernetes.node.name * kubernetes.node.uid -====== Service spesific: +====== Service specific: * kubernetes.namespace * kubernetes.service.name * kubernetes.service.uid From c5c9328eb574e72d9649e403bf1770072619cacd Mon Sep 17 00:00:00 2001 From: chrismark Date: Mon, 16 Dec 2019 12:12:22 +0200 Subject: [PATCH 3/3] fix headers Signed-off-by: chrismark --- libbeat/docs/shared-autodiscover.asciidoc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libbeat/docs/shared-autodiscover.asciidoc b/libbeat/docs/shared-autodiscover.asciidoc index fc85a87502f..8768d7252aa 100644 --- a/libbeat/docs/shared-autodiscover.asciidoc +++ b/libbeat/docs/shared-autodiscover.asciidoc @@ -120,12 +120,14 @@ The Kubernetes autodiscover provider watches for Kubernetes nodes, pods, service These are the available fields during within config templating. The `kubernetes.*` fields will be available on each emitted event. +[float] ====== Generic fields: * host * port (if exposed) * kubernetes.labels * kubernetes.annotations +[float] ====== Pod specific: * kubernetes.container.id * kubernetes.container.image @@ -135,10 +137,12 @@ These are the available fields during within config templating. The `kubernetes. * kubernetes.pod.name * kubernetes.pod.uid +[float] ====== Node specific: * kubernetes.node.name * kubernetes.node.uid +[float] ====== Service specific: * kubernetes.namespace * kubernetes.service.name