Skip to content

Commit

Permalink
Revert "Adding inforamtion for CRI-O configuration and enhancing our …
Browse files Browse the repository at this point in the history
…manifest… (elastic#32151)"

This reverts commit c47ef26.
  • Loading branch information
bmorelli25 committed Jul 11, 2022
1 parent c47ef26 commit aea4c74
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 41 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ 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/log/containers/*.log
# - /var/lib/docker/containers/${data.docker.container.id}/*.log
8 changes: 1 addition & 7 deletions filebeat/docs/inputs/input-container.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,11 @@ Example configuration:
{beatname_lc}.inputs:
- type: container
paths: <1>
- '/var/log/containers/*.log'
- '/var/lib/docker/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: 0 additions & 30 deletions filebeat/docs/running-on-kubernetes.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -112,36 +112,6 @@ 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
2 changes: 1 addition & 1 deletion filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1201,7 +1201,7 @@ filebeat.inputs:
# config:
# - type: container
# paths:
# - /var/log/containers/*.log
# - /var/lib/docker/containers/${data.docker.container.id}/*.log

# ========================== Filebeat global options ===========================

Expand Down
2 changes: 1 addition & 1 deletion x-pack/filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3530,7 +3530,7 @@ filebeat.inputs:
# config:
# - type: container
# paths:
# - /var/log/containers/*.log
# - /var/lib/docker/containers/${data.docker.container.id}/*.log

# ========================== Filebeat global options ===========================

Expand Down

0 comments on commit aea4c74

Please sign in to comment.