Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Filebeat improvements #568

Merged
merged 5 commits into from
Apr 10, 2020
Merged

Filebeat improvements #568

merged 5 commits into from
Apr 10, 2020

Conversation

jmlrt
Copy link
Member

@jmlrt jmlrt commented Apr 8, 2020

  • Remove in_cluster config from `add_kubernetes_metadata
  • Use container input instead of docker input
  • Use recommended values for add_kubernetes_metadata

Fixes #558

  • Chart version not bumped (the versions are all bumped and released at the same time)
  • README.md updated with any new values or changes
  • Updated template tests in ${CHART}/tests/*.py
  • Updated integration tests in ${CHART}/examples/*/test/goss.yaml

@jmlrt jmlrt requested review from mdelapenya and a team April 8, 2020 16:19
@jmlrt jmlrt added the enhancement New feature or request label Apr 8, 2020
mdelapenya
mdelapenya previously approved these changes Apr 8, 2020
Copy link

@mdelapenya mdelapenya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I'd like @ChrsMark to also review it, as his team is the stakeholder of the Helm chart reference

- '*'
- type: container
paths:
- /var/log/containers/*.log
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to be sure, is this path actually where hosts' var/log is mounted? This is what I expect to see https://github.com/elastic/beats/blob/1a029e547fb1018668e7ab961bcbbe496696ff25/deploy/kubernetes/filebeat-kubernetes.yaml#L110.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the notice, fixed by 72f704e

[filebeat] mount /var/log inside filebeat pods

This is required to use container input withg CRI paths.
@jmlrt
Copy link
Member Author

jmlrt commented Apr 9, 2020

jenkins test this please

ChrsMark
ChrsMark previously approved these changes Apr 9, 2020
Copy link
Member

@ChrsMark ChrsMark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

@jmlrt
Copy link
Member Author

jmlrt commented Apr 9, 2020

jenkins test this please

1 similar comment
@jmlrt
Copy link
Member Author

jmlrt commented Apr 9, 2020

jenkins test this please

mdelapenya
mdelapenya previously approved these changes Apr 10, 2020
Copy link

@mdelapenya mdelapenya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

image

in_cluster: true
output.elasticsearch:
host: '${NODE_NAME}'
hosts: '${ELASTICSEARCH_HOSTS:elasticsearch-master:9200}'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a new line please

container input doesn't exist on 6.8 and in_cluster is still documented
Copy link
Member

@mgreau mgreau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jmlrt jmlrt merged commit b3bb665 into elastic:master Apr 10, 2020
@jmlrt jmlrt deleted the filebeat-improvements branch April 10, 2020 13:12
mgreau pushed a commit that referenced this pull request Apr 14, 2020
@jmlrt jmlrt mentioned this pull request Oct 28, 2020
@jmlrt jmlrt mentioned this pull request Nov 17, 2020
This was referenced Nov 17, 2020
@jmlrt jmlrt mentioned this pull request Feb 8, 2021
This was referenced Mar 15, 2021
@jmlrt jmlrt mentioned this pull request May 25, 2021
@jmlrt jmlrt mentioned this pull request Mar 8, 2022
@jmlrt jmlrt mentioned this pull request Apr 21, 2022
This was referenced Sep 14, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Filebeat improvements
4 participants