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

Remove index management, always use data streams #6606

Merged
merged 6 commits into from
Nov 16, 2021

Conversation

axw
Copy link
Member

@axw axw commented Nov 15, 2021

Motivation/summary

  • Remove apm-server.ilm.* config
  • Remove apm-server.data_streams.enabled config
  • Remove setup.* config
  • Remove output.elasticsearch.{index,indices} config
  • Stop building, including, and using libbeat fields

Checklist

  • Update CHANGELOG.asciidoc
    - [ ] Documentation has been updated Doc updates being handled separately

How to test these changes

  1. Run apm-server without any special config, other than Elasticsearch host & credentials
  2. Install the APM integration package via Kibana
  3. Send events to apm-server
  4. Check events are indexed into data streams

Related issues

Closes #5961

@axw axw added v8.0.0 backport-8.0 Automated backport with mergify labels Nov 15, 2021
@axw axw force-pushed the no-index-management branch from 0e5b43d to 0c2644f Compare November 15, 2021 03:31
@apmmachine
Copy link
Contributor

apmmachine commented Nov 15, 2021

💚 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: 2021-11-16T01:19:07.192+0000

  • Duration: 49 min 25 sec

  • Commit: ae0b3bd

Test stats 🧪

Test Results
Failed 0
Passed 5610
Skipped 19
Total 5629

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /hey-apm : Run the hey-apm benchmark.

  • /package : Generate and publish the docker images.

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

@axw axw force-pushed the no-index-management branch from 0c2644f to 2885686 Compare November 15, 2021 04:08
@mergify
Copy link
Contributor

mergify bot commented Nov 15, 2021

This pull request is now in conflicts. Could you fix it @axw? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b no-index-management upstream/no-index-management
git merge upstream/master
git push upstream no-index-management

axw added 2 commits November 15, 2021 17:26
- Remove `apm-server.ilm.*` config
- Remove `apm-server.data_streams.enabled` config
- Remove `setup.*` config
- Remove `output.elasticsearch.{index,indices}` config
- Stop building, including, and using libbeat fields
A bunch of transitive dependencies are removed, because we're
no longer including the x-pack/libbeat processors.
@axw axw force-pushed the no-index-management branch from 2885686 to 00cfa0f Compare November 15, 2021 09:26
@axw axw marked this pull request as ready for review November 15, 2021 09:44
@axw axw requested a review from a team November 15, 2021 09:45
@mergify
Copy link
Contributor

mergify bot commented Nov 15, 2021

This pull request is now in conflicts. Could you fix it @axw? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b no-index-management upstream/no-index-management
git merge upstream/master
git push upstream no-index-management

Copy link
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you going to remove the apm-server.register.ingest.pipeline in a separate PR?

README.md Show resolved Hide resolved
@axw
Copy link
Member Author

axw commented Nov 15, 2021

Are you going to remove the apm-server.register.ingest.pipeline in a separate PR?

@simitt do you mean remove from apm-server.yml? It was removed in #6575:

642aaee#diff-fbadce52f216b92bda4dab62b076f334502b170af5e51bf3e442e2033b4a4e9d

@simitt
Copy link
Contributor

simitt commented Nov 15, 2021

Yes. Sorry I missed that and still had it in my main branch when I checked.

@axw axw requested a review from simitt November 16, 2021 03:20
@axw axw merged commit 01d75ec into elastic:master Nov 16, 2021
@axw axw deleted the no-index-management branch November 16, 2021 13:00
mergify bot pushed a commit that referenced this pull request Nov 16, 2021
* Remove index management, always use data streams

- Remove `apm-server.ilm.*` config
- Remove `apm-server.data_streams.enabled` config
- Remove `setup.*` config
- Remove `output.elasticsearch.{index,indices}` config
- Stop building, including, and using libbeat fields

* Update notice

A bunch of transitive dependencies are removed, because we're
no longer including the x-pack/libbeat processors.

* Update README

* Fix merge

(cherry picked from commit 01d75ec)
axw added a commit that referenced this pull request Nov 16, 2021
* Remove index management, always use data streams

- Remove `apm-server.ilm.*` config
- Remove `apm-server.data_streams.enabled` config
- Remove `setup.*` config
- Remove `output.elasticsearch.{index,indices}` config
- Stop building, including, and using libbeat fields

* Update notice

A bunch of transitive dependencies are removed, because we're
no longer including the x-pack/libbeat processors.

* Update README

* Fix merge

(cherry picked from commit 01d75ec)

Co-authored-by: Andrew Wilkins <[email protected]>
@marclop marclop self-assigned this Dec 21, 2021
@marclop
Copy link
Contributor

marclop commented Dec 21, 2021

Verified using 9bb5e4c.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove Elasticsearch setup, default to waiting for data streams to be set up
5 participants