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

Adding inforamtion for CRI-O configuration and enhancing our manifest… #32151

Merged
merged 23 commits into from
Jul 11, 2022
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ https://github.com/elastic/beats/compare/v8.2.0\...main[Check the HEAD diff]
- Add template helper function for decoding hexadecimal strings. {pull}31886[31886]
- Add new `parser` called `include_message` to filter based on message contents. {issue}31794[31794] {pull}32094[32094]
- Extend list of mapped record types in o365 Audit module. {pull}32217[32217]
- Add references for CRI-O configuration in input-container and in our kubernetes manifests {issue}32149[32149] {pull}32151[32151]

*Auditbeat*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# config:
# - type: container
# paths:
# - /var/lib/docker/containers/${data.docker.container.id}/*.log
# - /var/log/containers/*.log
8 changes: 7 additions & 1 deletion filebeat/docs/inputs/input-container.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,17 @@ Example configuration:
{beatname_lc}.inputs:
- type: container
paths: <1>
- '/var/lib/docker/containers/*/*.log'
- '/var/log/containers/*.log'
----

<1> `paths` is required. All other settings are optional.


> ----
'/var/log/containers/*.log' is normally a symlink to '/var/log/pods/*/*/.log',
so above path can be edited accordingly


==== Configuration options

The `container` input supports the following configuration options plus the
Expand Down
30 changes: 30 additions & 0 deletions filebeat/docs/running-on-kubernetes.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,36 @@ oc patch namespace kube-system -p \
This command sets the node selector for the project to an empty string. If you
don't run this command, the default node selector will skip master nodes.

In order to support runtime environments with Openshift (eg. CRI-O, containerd) you need to configure following path:

["source","yaml",subs="attributes"]
----
{beatname_lc}.inputs:
- type: container
paths: <1>
- '/var/log/containers/*.log'
----

Same path needs to be configured in case autodiscovery needs to be enabled:

["source","yaml",subs="attributes"]
----
filebeat.autodiscover:
providers:
- type: kubernetes
node: ${NODE_NAME}
hints.enabled: true
hints.default_config:
type: container
paths:
- /var/log/containers/*.log
----

> ----
'/var/log/containers/*.log' is normally a symlink to '/var/log/pods/*/*/.log',
so above paths can be edited accordingly


[float]
==== Load {kib} dashboards

Expand Down