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

Add data_streams.wait_for_integration #5928

Merged
merged 1 commit into from
Aug 11, 2021
Merged

Conversation

axw
Copy link
Member

@axw axw commented Aug 11, 2021

Motivation/summary

Add apm-server.data_streams.wait_for_integration config. When both this and apm-server.data_streams.enabled are true, the server will wait at startup until the APM integration package is installed.

For now this requires apm-server.kibana to be configured, and will query the Fleet API to query the integration package status. We should follow up with a parallel query to Elasticsearch (if configured) to check if the index templates have been created.

Checklist

How to test these changes

  1. Create a fresh cluster with no integration isntall
  2. Run apm-server with apm-server.data_streams.enable=true (wait_for_integration defaults to true)
  3. Observe that apm-server logs that it is waiting for the integration, and it does not start listening on 8200
  4. Install the apm integration package in Kibana
  5. Observe that apm-server continues, and starts listening on 8200
  6. Send some events
  7. Check that they are indexed into data streams

Related issues

#5914

@apmmachine
Copy link
Contributor

apmmachine commented Aug 11, 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-08-11T12:53:38.237+0000

  • Duration: 44 min 47 sec

  • Commit: d7bdf49

Test stats 🧪

Test Results
Failed 0
Passed 5918
Skipped 14
Total 5932

Trends 🧪

Image of Build Times

Image of Tests

@axw axw force-pushed the standalone-datastreams branch 2 times, most recently from f3ed031 to ef9cc9d Compare August 11, 2021 09:37
@axw axw force-pushed the standalone-datastreams branch from ef9cc9d to d7bdf49 Compare August 11, 2021 09:38
@axw axw requested review from Mpdreamz and a team August 11, 2021 10:02
@axw axw marked this pull request as ready for review August 11, 2021 10:02
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.

Haven't run it but changes look good.

@axw
Copy link
Member Author

axw commented Aug 11, 2021

/test

@axw axw enabled auto-merge (squash) August 11, 2021 12:53
@axw axw merged commit 114d7d6 into elastic:master Aug 11, 2021
mergify bot pushed a commit that referenced this pull request Aug 11, 2021
(cherry picked from commit 114d7d6)

# Conflicts:
#	beater/beater.go
#	changelogs/head.asciidoc
@axw axw deleted the standalone-datastreams branch August 12, 2021 01:45
axw added a commit that referenced this pull request Aug 12, 2021
* Add `data_streams.wait_for_integration` (#5928)

(cherry picked from commit 114d7d6)

# Conflicts:
#	beater/beater.go
#	changelogs/head.asciidoc

* Delete head.asciidoc

* Fix merge conflicts

Co-authored-by: Andrew Wilkins <[email protected]>
@stuartnelson3
Copy link
Contributor

Confirmed with BC3

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

Successfully merging this pull request may close these issues.

4 participants