From 54d0b5c4726bcc01d48f6f281fc7b020258a9ba5 Mon Sep 17 00:00:00 2001 From: Vijay Samuel Date: Mon, 2 Mar 2020 22:26:03 -0800 Subject: [PATCH] Add documentation --- filebeat/docs/autodiscover-hints.asciidoc | 18 ++++++++++++++++++ metricbeat/docs/autodiscover-hints.asciidoc | 19 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/filebeat/docs/autodiscover-hints.asciidoc b/filebeat/docs/autodiscover-hints.asciidoc index a7caddb3048..8201de0e620 100644 --- a/filebeat/docs/autodiscover-hints.asciidoc +++ b/filebeat/docs/autodiscover-hints.asciidoc @@ -155,6 +155,24 @@ annotations: co.elastic.logs.sidecar/exclude_lines: '^DBG' ----- +[float] +===== Configuring Namespace Defaults + +Hints can be configured on the Namespace's annotations as defaults to use when Pod level annotations are missing. +The resultant hints are a combination of Pod annotations and Namespace annotations with the Pod's taking precedence. To +enable Namespace defaults configure the `add_resource_metadata` for Namespace objects as follows: + +["source","yaml",subs="attributes"] +------------------------------------------------------------------------------------- +filebeat.autodiscover: + providers: + - type: kubernetes + hints.enabled: true + add_resource_metadata: + namespace: + enabled: true +------------------------------------------------------------------------------------- + [float] diff --git a/metricbeat/docs/autodiscover-hints.asciidoc b/metricbeat/docs/autodiscover-hints.asciidoc index e12754d3313..1bc56d8f54d 100644 --- a/metricbeat/docs/autodiscover-hints.asciidoc +++ b/metricbeat/docs/autodiscover-hints.asciidoc @@ -126,6 +126,25 @@ annotations: co.elastic.metrics.sidecar/hosts: '${data.host}:8080' ------------------------------------------------------------------------------------- +[float] +===== Configuring Namespace Defaults + +Hints can be configured on the Namespace's annotations as defaults to use when Pod level annotations are missing. +The resultant hints are a combination of Pod annotations and Namespace annotations with the Pod's taking precedence. To +enable Namespace defaults configure the `add_resource_metadata` for Namespace objects as follows: + +["source","yaml",subs="attributes"] +------------------------------------------------------------------------------------- +metricbeat.autodiscover: + providers: + - type: kubernetes + hints.enabled: true + add_resource_metadata: + namespace: + enabled: true +------------------------------------------------------------------------------------- + + [float] === Docker