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.

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

Regex support of add_resource_metadata #834

Merged
merged 27 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b819bf8
adding page for adavnce agent with k8s
gizas Jan 11, 2024
d4befc3
adding kubernetes provider example
gizas Jan 11, 2024
3ff2fda
fxing typos and indentation
gizas Jan 11, 2024
eba0e78
fxing typos and indentation
gizas Jan 11, 2024
908ba5c
Update docs/en/ingest-management/elastic-agent/advanced-kubernetes-ma…
gizas Jan 11, 2024
f6788b4
Update docs/en/ingest-management/elastic-agent/advanced-kubernetes-ma…
gizas Jan 11, 2024
ab41b7c
Update docs/en/ingest-management/elastic-agent/advanced-kubernetes-ma…
gizas Jan 11, 2024
72c6927
Update docs/en/ingest-management/elastic-agent/advanced-kubernetes-ma…
gizas Jan 11, 2024
f9f2752
Update docs/en/ingest-management/elastic-agent/advanced-kubernetes-ma…
gizas Jan 11, 2024
7a19a73
Update docs/en/ingest-management/elastic-agent/advanced-kubernetes-ma…
gizas Jan 11, 2024
2f5fe6f
Update docs/en/ingest-management/elastic-agent/advanced-kubernetes-ma…
gizas Jan 12, 2024
8d89798
udpating code yaml box and adding parameter of manifest
gizas Jan 12, 2024
8976765
updating number in list
gizas Jan 12, 2024
21e3caa
updating number in list and iamge for kibana UI
gizas Jan 12, 2024
712af25
adding initial doc for metadata enrichment
gizas Jan 15, 2024
b4c07b9
adding initial doc for metadata enrichment
gizas Jan 15, 2024
d61c7f6
adding initial doc for metadata enrichment
gizas Jan 15, 2024
18ebcf9
adding examples
gizas Jan 16, 2024
928dcbb
Update docs/en/ingest-management/elastic-agent/configuration/provider…
gizas Jan 22, 2024
416f78f
Update docs/en/ingest-management/processors/processor-add_kubernetes_…
gizas Jan 22, 2024
939a81b
fixing conflicts
gizas Jan 22, 2024
96149ba
fixing conflicts and adding wildcards
gizas Jan 22, 2024
4b206d6
fixing part of add_resource
gizas Jan 22, 2024
ade809f
Fix kubernetes provider documentation (#817)
tetianakravchenko Jan 18, 2024
3f8cc23
squashing
gizas Jan 22, 2024
48c18f7
squashing
gizas Jan 22, 2024
01c9b65
fixing newline
gizas Jan 22, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,13 @@ will be excluded from the event.
By default it is `true`.
`annotations.dedot`:: (Optional) If set to be `true` in the provider config, then `.` in annotations will be replaced
with `_`. By default it is `true`.

`add_resource_metadata`:: (Optional) Specify filters and configration for the extra metadata, that will be added to the event.
Configuration parameters:
* `node` or `namespace`: Specify labels and annotations filters for the extra metadata coming from node and namespace. By default
all labels are included while annotations are not. To change the default behaviour `include_labels`, `exclude_labels` and `include_annotations`
can be defined. These settings are useful when storing labels and annotations that require special handling to avoid overloading the storage output.
Note: wildcards are not supported for those settings.
The enrichment of `node` or `namespace` metadata can be individually disabled by setting `enabled: false`.
Wildcards are supported in these settings by using `use_regex_include: true` in combination with `include_labels`, and respectively by setting `use_regex_exclude: true` in combination with `exclude_labels`.
* `deployment`: If resource is `pod` and it is created from a `deployment`, by default the deployment name isn't added, this can be enabled by setting `deployment: true`.
* `cronjob`: If resource is `pod` and it is created from a `cronjob`, by default the cronjob name isn't added, this can be enabled by setting `cronjob: true`.
Example:
Expand All @@ -84,10 +83,16 @@ Configuration parameters:
-------------------------------------------------------------------------------------
add_resource_metadata:
namespace:
#use_regex_include: false
include_labels: ["namespacelabel1"]
#use_regex_exclude: false
#exclude_labels: ["namespacelabel2"]
node:
#use_regex_include: false
include_labels: ["nodelabel2"]
include_annotations: ["nodeannotation1"]
#use_regex_exclude: false
#exclude_labels: ["nodelabel3"]
#deployment: false
#cronjob: false
-------------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ a| Filters and configuration for adding extra metadata to the event. This settin
By default all labels are included, but annotations are not.
To change the default behavior, you can set `include_labels`, `exclude_labels`, and `include_annotations`.
These settings are useful when storing labels and annotations that require special handling to avoid overloading the storage output.
Note that wildcards are not supported in these settings.
Wildcards are supported in these settings by using `use_regex_include: true` in combination with `include_labels`, and respectively by setting `use_regex_exclude: true` in combination with `exclude_labels`.
To turn off enrichment of `node` or `namespace` metadata individually, set `enabled: false`.
* `deployment`: If the resource is `pod` and it is created from a `deployment`, the deployment name is not added by default. To enable this behavior, set `deployment: true`.
* `cronjob`: If the resource is `pod` and it is created from a `cronjob`, the cronjob name is not added by default. To enable this behavior, set `cronjob: true`.
Expand All @@ -151,11 +151,17 @@ To turn off enrichment of `node` or `namespace` metadata individually, set `enab
add_resource_metadata:
namespace:
include_labels: ["namespacelabel1"]
# use_regex_include: false
# use_regex_exclude: false
# exclude_labels: ["namespacelabel2"]
#labels.dedot: true
#annotations.dedot: true
node:
# use_regex_include: false
include_labels: ["nodelabel2"]
include_annotations: ["nodeannotation1"]
# use_regex_exclude: false
# exclude_annotations: ["nodeannotation2"]
#labels.dedot: true
#annotations.dedot: true
deployment: true
Expand Down