Skip to content

Enable data streams for apm-server when running under Agent#22689

Merged
jalvz merged 1 commit intoelastic:masterfrom
jalvz:update-apm-spec
Nov 23, 2020
Merged

Enable data streams for apm-server when running under Agent#22689
jalvz merged 1 commit intoelastic:masterfrom
jalvz:update-apm-spec

Conversation

@jalvz
Copy link
Copy Markdown
Contributor

@jalvz jalvz commented Nov 20, 2020

What does this PR do?

Updates the apm-server spec for Elastic Agent

Why is it important?

It is important to ensure apm-server uses data streams when running under Agent.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

related: elastic/apm-server#4449

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label Team:Ingest Management labels Nov 20, 2020
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 20, 2020

Pinging @elastic/ingest-management (Team:Ingest Management)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 20, 2020
@jalvz jalvz mentioned this pull request Nov 20, 2020
Merged
3 tasks
blakerouse
blakerouse approved these changes Nov 20, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@blakerouse blakerouse left a comment

Choose a reason for hiding this comment

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

Change looks simple enough.

Enabling APM Server, woohoo!

ruflin
ruflin approved these changes Nov 20, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

Change LGTM. But I'm wondering if we really need an additional flag or if we could just assume the flag to be set if management.enabled=true that also data_streams are enabled?

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Nov 20, 2020

💚 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: [Pull request #22689 opened]

  • Start Time: 2020-11-20T13:46:09.031+0000

  • Duration: 20 min 18 sec

Test stats 🧪

Test Results
Failed 0
Passed 1396
Skipped 4
Total 1400

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 1396
Skipped 4
Total 1400

@axw
Copy link
Copy Markdown
Member

axw commented Nov 21, 2020 •
edited
Loading

Change LGTM. But I'm wondering if we really need an additional flag or if we could just assume the flag to be set if management.enabled=true that also data_streams are enabled?

Yes, probably. We will already return an error if data streams are not enabled, so we could just enable them automatically. I can update elastic/apm-server#4449 to enable it by default in this case. @jalvz WDYT?

EDIT: having looked at the apm-server code for a bit, I think it's going to take a non-trivial amount of work to do this in a nice way (there's some chicken-and-egg w.r.t. config defaults and validation). Let's go ahead with this change as-is, and follow up with improvements later.

@jalvz jalvz merged commit d966a98 into elastic:master Nov 23, 2020
@jalvz jalvz mentioned this pull request Nov 23, 2020
Closed
15 tasks
jalvz added a commit to jalvz/beats that referenced this pull request Dec 1, 2020
@jalvz
Enable data streams for apm-server when running under Agent (elastic#…
a2c0047 
…22689)
@jalvz jalvz mentioned this pull request Jan 26, 2021
Closed
jalvz added a commit to jalvz/beats that referenced this pull request Jan 26, 2021
@jalvz
Enable data streams for apm-server when running under Agent (elastic#…
77a2349 
…22689)

# Conflicts:
#	x-pack/elastic-agent/pkg/agent/program/supported.go
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ruflin ruflin ruflin approved these changes

@blakerouse blakerouse blakerouse approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jalvz @elasticmachine @axw @ruflin @blakerouse