-
Notifications
You must be signed in to change notification settings - Fork 4.9k
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
[8.x](backport #40301) Disable kubeadm for filebeat (both filbeat.input and filbeat.autodiscover) #40889
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…over) (#40301) * disable kubeadm for filebeat autodiscover * Update filebeat/_meta/test/docs/01_playground/filebeat.yaml Co-authored-by: Tiago Queiroz <tiago.queiroz@elastic.co> * Update libbeat/processors/add_kubernetes_metadata/docs/add_kubernetes_metadata.asciidoc Co-authored-by: Tiago Queiroz <tiago.queiroz@elastic.co> * Update dev-tools/kubernetes/filebeat/Dockerfile.debug Co-authored-by: Tiago Queiroz <tiago.queiroz@elastic.co> * fixing docs and adding mericbeat references * fixing docs and adding mericbeat references * Update filebeat/_meta/config/filebeat.autodiscover.reference.yml.tmpl Co-authored-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> --------- Co-authored-by: Tiago Queiroz <tiago.queiroz@elastic.co> Co-authored-by: Tetiana Kravchenko <tetiana.kravchenko@elastic.co> (cherry picked from commit 89cd840) # Conflicts: # metricbeat/module/kubernetes/util/kubernetes.go
mergify
bot
added
the
conflicts
There is a conflict in the backported pull request
label
Sep 18, 2024
mergify
bot
requested review from
mauri870,
khushijain21,
gizas and
constanca-m
and removed request for
a team
September 18, 2024 15:20
Cherry-pick of 89cd840 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
botelastic
bot
added
the
needs_team
Indicates that the issue/PR needs a Team:* label
label
Sep 18, 2024
pierrehilbert
added
Team:obs-ds-hosted-services
Label for the Observability Hosted Services team
Team:Elastic-Agent-Data-Plane
Label for the Agent Data Plane team
labels
Sep 18, 2024
Pinging @elastic/elastic-agent-data-plane (Team:Elastic-Agent-Data-Plane) |
Pinging @elastic/obs-ds-hosted-services (Team:obs-ds-hosted-services) |
botelastic
bot
removed
the
needs_team
Indicates that the issue/PR needs a Team:* label
label
Sep 18, 2024
gizas
approved these changes
Sep 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport
conflicts
There is a conflict in the backported pull request
Team:Elastic-Agent-Data-Plane
Label for the Agent Data Plane team
Team:obs-ds-hosted-services
Label for the Observability Hosted Services team
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
NOTE: Dont merge until elastic/elastic-agent-autodiscover#98 is also mergedProposed commit message
WHAT: Provide a configuration option to disable /api/v1/namespaces/kube-system/configmaps/kubeadm-config for filebeat autodiscovery and add_kubernetes_metadata processor. In more details user will disable the api requests by using configuration use_kubeadm: false
In this PR we added the option in order to support both filbeat.input and filebeat.autodiscover blocks of configuration.
WHY: https://github.com/elastic/enhancements/issues/21172
Checklist
CHANGELOG.next.asciidoc
orCHANGELOG-developer.next.asciidoc
.How to test this PR locally
Related issues
Screenshots
LOG processing continues successfully:
For the filebeat.input block:
LOG processing continues successfully:
This is an automatic backport of pull request #40301 done by [Mergify](https://mergify.com).