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.3](backport #700) Fix for the filebeat spec file picking up packetbeat inputs #723

Merged
merged 2 commits into from
Jul 14, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 14, 2022

This is an automatic backport of pull request #700 done by Mergify.
Cherry-pick of 4dcc16b has failed:

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

You are currently cherry-picking commit 4dcc16b82.
  (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:   internal/pkg/agent/program/testdata/single_config-packetbeat.yml
	modified:   internal/pkg/agent/program/testdata/single_config.yml
	modified:   internal/spec/filebeat.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   internal/pkg/agent/program/supported.go

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

* Reproduce filebeat picking up packetbeat inputs

* Filebeat: filter inputs as first input transform.

Move input filtering to be the first input transformation that occurs in
the filebeat spec file. Fixes
#427.

* Update changelog.

(cherry picked from commit 4dcc16b)

# Conflicts:
#	internal/pkg/agent/program/supported.go
@mergify mergify bot requested a review from a team as a code owner July 14, 2022 15:25
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 14, 2022
@mergify mergify bot requested review from AndersonQ and michel-laterman and removed request for a team July 14, 2022 15:25
@elasticmachine
Copy link
Contributor

elasticmachine commented Jul 14, 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-07-14T18:01:29.055+0000

  • Duration: 18 min 52 sec

Test stats 🧪

Test Results
Failed 0
Passed 6011
Skipped 23
Total 6034

💚 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.

  • run integration tests : Run the Elastic Agent Integration tests.

  • run end-to-end tests : Generate the packages and run the E2E Tests.

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

@elasticmachine
Copy link
Contributor

🌐 Coverage report

Name Metrics % (covered/total) Diff
Packages 97.222% (70/72) 👍
Files 68.636% (151/220) 👍
Classes 68.254% (301/441) 👍
Methods 51.722% (826/1597) 👍
Lines 38.027% (8858/23294) 👎 -0.017
Conditionals 100.0% (0/0) 💚

@cmacknz cmacknz merged commit 4a2e961 into 8.3 Jul 14, 2022
@cmacknz cmacknz deleted the mergify/bp/8.3/pr-700 branch July 14, 2022 18:36
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants