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

[8.1](backport #30534) [libbeat | filebeat] Log error when parsing config block and disabled input on filebeat #30655

Merged
merged 3 commits into from
Mar 3, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 2, 2022

This is an automatic backport of pull request #30534 done by Mergify.
Cherry-pick of b25fdf6 has failed:

On branch mergify/bp/8.1/pr-30534
Your branch is up to date with 'origin/8.1'.

You are currently cherry-picking commit b25fdf6a35.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   CHANGELOG.next.asciidoc
	modified:   filebeat/input/log/harvester.go
	modified:   filebeat/tests/system/test_stdin.py
	modified:   x-pack/libbeat/management/manager.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   filebeat/beater/crawler.go
	both modified:   libbeat/tests/system/beat/beat.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…30534)

- log error when parsing config block and disabled input on filebeat
- adjust tests and add an optional error message for 'wait_until' on libbeat python tests

(cherry picked from commit b25fdf6)

# Conflicts:
#	filebeat/beater/crawler.go
#	libbeat/tests/system/beat/beat.py
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Mar 2, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Mar 2, 2022
@botelastic
Copy link

botelastic bot commented Mar 2, 2022

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Mar 2, 2022

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2022-03-03T09:08:22.968+0000

  • Duration: 124 min 30 sec

Test stats 🧪

Test Results
Failed 0
Passed 42931
Skipped 3853
Total 46784

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@AndersonQ AndersonQ merged commit 5257217 into 8.1 Mar 3, 2022
@AndersonQ AndersonQ deleted the mergify/bp/8.1/pr-30534 branch March 3, 2022 15:15
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 needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants