Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for kubernetes provider to recognize namespace level defaults #16321

Merged
merged 3 commits into from
Mar 10, 2020
+389 −6
Merged

Add support for kubernetes provider to recognize namespace level defaults #16321

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bba2ae
Add support for kubernetes provider to recognize namespace level defa…
vjsamuel Feb 14, 2020
c377c01
Incorporate review comments
vjsamuel Feb 24, 2020
54d0b5c
Add documentation
vjsamuel Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add documentation
@vjsamuel
vjsamuel committed Mar 10, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
commit 54d0b5c4726bcc01d48f6f281fc7b020258a9ba5
18 changes: 18 additions & 0 deletions filebeat/docs/autodiscover-hints.asciidoc
View file
Original file line number Diff line number Diff line change
@@ -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]
19 changes: 19 additions & 0 deletions metricbeat/docs/autodiscover-hints.asciidoc
View file
Original file line number Diff line number Diff line change
@@ -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