Skip to content

[7.x](backport #25696) Remove Beats central management#26012

Merged
michel-laterman merged 2 commits into7.xfrom
mergify/bp/7.x/pr-25696
Jun 1, 2021
Merged

[7.x](backport #25696) Remove Beats central management#26012
michel-laterman merged 2 commits into7.xfrom
mergify/bp/7.x/pr-25696

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 31, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #25696 done by Mergify.
Cherry-pick of 27e76c5 has failed:

On branch mergify/bp/7.x/pr-25696
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 27e76c567.
  (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/docs/howto/load-ingest-pipelines.asciidoc
	modified:   filebeat/docs/index.asciidoc
	deleted:    libbeat/docs/shared-central-management.asciidoc
	modified:   metricbeat/docs/index.asciidoc
	modified:   x-pack/auditbeat/cmd/root.go
	modified:   x-pack/elastic-agent/pkg/agent/program/supported.go
	modified:   x-pack/elastic-agent/spec/apm-server.yml
	modified:   x-pack/elastic-agent/spec/filebeat.yml
	modified:   x-pack/elastic-agent/spec/heartbeat.yml
	modified:   x-pack/elastic-agent/spec/metricbeat.yml
	modified:   x-pack/elastic-agent/spec/osquerybeat.yml
	modified:   x-pack/elastic-agent/spec/packetbeat.yml
	modified:   x-pack/filebeat/cmd/root.go
	modified:   x-pack/heartbeat/cmd/root.go
	modified:   x-pack/journalbeat/cmd/root.go
	deleted:    x-pack/libbeat/cmd/enroll.go
	deleted:    x-pack/libbeat/cmd/inject.go
	modified:   x-pack/libbeat/libbeat.go
	deleted:    x-pack/libbeat/management/api/auth_client.go
	deleted:    x-pack/libbeat/management/api/auth_client_test.go
	deleted:    x-pack/libbeat/management/api/client.go
	deleted:    x-pack/libbeat/management/api/client_test.go
	deleted:    x-pack/libbeat/management/api/configuration.go
	deleted:    x-pack/libbeat/management/api/configuration_test.go
	deleted:    x-pack/libbeat/management/api/convert.go
	deleted:    x-pack/libbeat/management/api/convert_test.go
	deleted:    x-pack/libbeat/management/api/doc.go
	deleted:    x-pack/libbeat/management/api/enroll.go
	deleted:    x-pack/libbeat/management/api/enrollment_token.go
	deleted:    x-pack/libbeat/management/api/enrollment_token_test.go
	deleted:    x-pack/libbeat/management/api/event_reporter.go
	deleted:    x-pack/libbeat/management/api/event_reporter_test.go
	deleted:    x-pack/libbeat/management/api/response.go
	modified:   x-pack/libbeat/management/blacklist.go
	modified:   x-pack/libbeat/management/blacklist_test.go
	deleted:    x-pack/libbeat/management/cache.go
	deleted:    x-pack/libbeat/management/cache_test.go
	modified:   x-pack/libbeat/management/config.go
	deleted:    x-pack/libbeat/management/config_test.go
	deleted:    x-pack/libbeat/management/enroll.go
	deleted:    x-pack/libbeat/management/error.go
	deleted:    x-pack/libbeat/management/error_test.go
	deleted:    x-pack/libbeat/management/fleet/config.go
	deleted:    x-pack/libbeat/management/fleet/manager.go
	deleted:    x-pack/libbeat/management/fleet/manager_test.go
	deleted:    x-pack/libbeat/management/fleet/plugin.go
	modified:   x-pack/libbeat/management/manager.go
	modified:   x-pack/libbeat/management/manager_test.go
	modified:   x-pack/libbeat/management/plugin.go
	deleted:    x-pack/libbeat/management/state.go
	deleted:    x-pack/libbeat/management/state_test.go
	deleted:    x-pack/libbeat/tests/system/base.py
	deleted:    x-pack/libbeat/tests/system/config/mockbeat.yml.j2
	deleted:    x-pack/libbeat/tests/system/requirements.txt
	deleted:    x-pack/libbeat/tests/system/test_management.py
	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/rm <file>..." as appropriate to mark resolution)
	both modified:   x-pack/libbeat/include/include.go
	deleted by them: x-pack/libbeat/management/api/enroll_test.go
	both modified:   x-pack/winlogbeat/cmd/root.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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.io/

@michel-laterman
Remove Beats central management (#25696)
25dca51 
Remove the Kibana beats central management feature as it has been
replaced by Fleet. Remove xpack command injection and replace with
an includes mod. Restructure the xpack/libbeat/management module
to include all fleet code in the directory (no api or fleet subdirs).

(cherry picked from commit 27e76c5)

# Conflicts:
#	x-pack/libbeat/include/include.go
#	x-pack/libbeat/management/api/enroll_test.go
#	x-pack/winlogbeat/cmd/root.go
@mergify mergify bot requested a review from a team as a code owner May 31, 2021 14:45
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 31, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 31, 2021
@botelastic
Copy link
Copy Markdown

botelastic bot commented May 31, 2021

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

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented May 31, 2021 •
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

Expand to view the summary

Build stats

  • Build Cause: michel-laterman commented: /test

  • Start Time: 2021-06-01T19:29:13.019+0000

  • Duration: 66 min 4 sec

  • Commit: 6a55ac1

Test stats 🧪

Test Results
Failed 0
Passed 15
Skipped 16
Total 31

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 15
Skipped 16
Total 31

@urso
Copy link
Copy Markdown

urso commented May 31, 2021

Looks like Kibana still needs to clean their docs in the 7.x branch.

@michel-laterman
Copy link
Copy Markdown
Contributor

michel-laterman commented Jun 1, 2021

/test

1 similar comment
@michel-laterman
Copy link
Copy Markdown
Contributor

michel-laterman commented Jun 1, 2021

/test

@michel-laterman
Copy link
Copy Markdown
Contributor

michel-laterman commented Jun 1, 2021

@elasticmachine run docs build

@michel-laterman
Copy link
Copy Markdown
Contributor

michel-laterman commented Jun 1, 2021

@elasticmachine run elasticsearch-ci/docs

@michel-laterman michel-laterman merged commit 71d72ba into 7.x Jun 1, 2021
@michel-laterman michel-laterman deleted the mergify/bp/7.x/pr-25696 branch June 1, 2021 21:15
@ycombinator ycombinator mentioned this pull request Jun 2, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@michel-laterman michel-laterman

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 @urso @michel-laterman