Skip to content

[8.7](backport #35031) Fix performance issues with processors scaling under agent#35066

Merged
pierrehilbert merged 2 commits into8.7from
mergify/bp/8.7/pr-35031
Apr 12, 2023
Merged

[8.7](backport #35031) Fix performance issues with processors scaling under agent#35066
pierrehilbert merged 2 commits into8.7from
mergify/bp/8.7/pr-35031

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Apr 12, 2023 •
edited by zube bot
Loading

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

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

You are currently cherry-picking commit ea1293fdb0.
  (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:   auditbeat/cmd/root.go
	modified:   heartbeat/cmd/root.go
	modified:   libbeat/cmd/instance/beat.go
	modified:   libbeat/monitoring/report/elasticsearch/elasticsearch.go
	modified:   libbeat/processors/config.go
	modified:   libbeat/publisher/pipeline/stress/run.go
	modified:   libbeat/publisher/processing/default.go
	modified:   libbeat/publisher/processing/default_test.go
	modified:   libbeat/publisher/processing/processing.go
	modified:   metricbeat/cmd/root.go
	modified:   packetbeat/cmd/root.go
	modified:   winlogbeat/cmd/root.go
	modified:   x-pack/auditbeat/cmd/root.go
	modified:   x-pack/filebeat/cmd/agent.go
	modified:   x-pack/filebeat/cmd/root.go
	modified:   x-pack/libbeat/management/managerV2.go
	modified:   x-pack/metricbeat/cmd/agent.go
	modified:   x-pack/metricbeat/cmd/root.go
	modified:   x-pack/osquerybeat/cmd/root.go
	modified:   x-pack/packetbeat/cmd/root.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/management/management.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

@fearful-symmetry @mergify
Fix performance issues with processors scaling under agent (#35031)
3dcbbac 
* fix performance issues with processors scaling under agent

* make linter happy

* fix test

* add comment

* move around defaultProcessors

* fix tests, add diagnostics

* fix default processor on filebeat

* change log line

* Update CHANGELOG.next.asciidoc

Adding changelog entry

---------

Co-authored-by: Pierre HILBERT <pierre.hilbert@elastic.co>
(cherry picked from commit ea1293f)

# Conflicts:
#	libbeat/management/management.go
@mergify mergify bot requested review from a team as code owners April 12, 2023 14:12
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 12, 2023
@mergify mergify bot requested a review from a team as a code owner April 12, 2023 14:12
@mergify mergify bot requested review from cmacknz and rdner and removed request for a team April 12, 2023 14:12
@mergify mergify bot requested review from pchila and removed request for a team April 12, 2023 14:12
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 12, 2023
@botelastic
Copy link
Copy Markdown

botelastic bot commented Apr 12, 2023

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

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Apr 12, 2023 •
edited by jenkins-beats-ci bot
Loading

💚 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: 2023-04-12T14:29:55.691+0000

  • Duration: 93 min 29 sec

Test stats 🧪

Test Results
Failed 0
Passed 25971
Skipped 1968
Total 27939

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the 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!)

@pierrehilbert pierrehilbert merged commit 663be04 into 8.7 Apr 12, 2023
@pierrehilbert pierrehilbert deleted the mergify/bp/8.7/pr-35031 branch April 12, 2023 17:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rdner rdner Awaiting requested review from rdner rdner is a code owner automatically assigned from elastic/elastic-agent-data-plane

@cmacknz cmacknz Awaiting requested review from cmacknz cmacknz is a code owner automatically assigned from elastic/elastic-agent-data-plane

@pchila pchila Awaiting requested review from pchila pchila is a code owner automatically assigned from elastic/elastic-agent-control-plane

Assignees

@fearful-symmetry fearful-symmetry

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@elasticmachine @pierrehilbert @fearful-symmetry