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.

Sign up for GitHub

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

Jump to bottom

Initial spec file for apm-server #21225

Merged
merged 2 commits into from
Oct 1, 2020
Merged

Initial spec file for apm-server #21225

merged 2 commits into from
Oct 1, 2020

Conversation

jalvz
Copy link
Contributor

@jalvz jalvz commented Sep 22, 2020

What does this PR do?

Adds a spec for running APM Server under Elastic 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

@jalvz jalvz added Team:apm APM Server team issues/PRs Agent labels Sep 22, 2020
@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label Team:Ingest Management labels Sep 22, 2020
@elasticmachine
Copy link
Collaborator

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

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 22, 2020
@ph ph requested a review from ruflin September 22, 2020 15:22
@jalvz jalvz mentioned this pull request Sep 22, 2020
Merged
10 tasks
@elasticmachine
Copy link
Collaborator

elasticmachine commented Sep 22, 2020 •
edited by jenkins-beats-ci bot
Loading

💚 Build Succeeded

Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: [Pull request elastic/beats#21225 updated]

  • Start Time: 2020-09-30T13:27:56.723+0000

  • Duration: 38 min 51 sec

Test stats 🧪

Test Results
Failed 0
Passed 1390
Skipped 4
Total 1394

@jalvz
Copy link
Contributor Author

jalvz commented Sep 29, 2020

@ruflin any comments? :)

ruflin
ruflin approved these changes Sep 29, 2020
View reviewed changes
Copy link
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.

LGTM. It basically means, if the input is apm, run apm-server.

@ph Do we need to have the full list of outputs there?

@ph
Copy link
Contributor

ph commented Sep 29, 2020

@ruflin Yes, I would keep it consistent with all the other beats-like processes.

@jalvz
Copy link
Contributor Author

jalvz commented Sep 29, 2020

Do we need to have the full list of outputs there?

You mean in the when clause?

I added all that apm-server supports...

@ruflin
Copy link
Contributor

ruflin commented Sep 30, 2020

Yes, the when clause. If it is in line with other Beats, lets keep it.

@jalvz
Copy link
Contributor Author

jalvz commented Sep 30, 2020 •
edited
Loading

@ruflin @ph apm-server doesn't support Redis (isn't even documented), wouldn't be confusing to add it to the spec?
I expect that if apm-server is instructed to use a Redis output; the process wouldn't even start, as it would misbehave.

@ruflin
Copy link
Contributor

ruflin commented Sep 30, 2020

@jalvz Agree, it should not be there. My initial thinking was that we could even reduce it further to only support ES at first and open it later as in the case of Agent it is a new product and we can start small at first.

@ph
Copy link
Contributor

ph commented Sep 30, 2020

I didn't know that APM-Server didn't support redis, We will need to improve our "When" logic and just move to conditions instead.

@ph
Copy link
Contributor

ph commented Sep 30, 2020

Created this elastic/elastic-agent#121

@jalvz
Copy link
Contributor Author

jalvz commented Sep 30, 2020

Thanks both!
I like the idea of starting small, updated!

@jalvz jalvz merged commit 690afe9 into elastic:master Oct 1, 2020
v1v added a commit to v1v/beats that referenced this pull request Oct 2, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/windows-2016
ff9a47c 
* upstream/master: (27 commits)
  [Ingest Manager] Split index restrictions into type,dataset, namespace parts (elastic#21406)
  Update Filebeat module expected logs files (elastic#21454)
  Edit SQL module docs and fix broken doc structure (elastic#21233)
  [Ingest Manager] Send snapshot flag together with metadata (elastic#21285)
  Revert "[JJBB] Set shallow cloning to 10 (elastic#21409)" (elastic#21447)
  [JJBB] Use reference repo for fast checkouts (elastic#21410)
  Add initial skeleton of filestream input (elastic#21427)
  Initial spec file for apm-server (elastic#21225)
  [Ingest Manager] Upgrade Action: make source URI optional (elastic#21372)
  Add field limit check for AWS Cloudtrail flattened fields (elastic#21388)
  [Winlogbeat] Move winlogbeat javascript processor to libbeat (elastic#21402)
  ci: pipeline to generate the changelog (elastic#21426)
  [JJBB] Set shallow cloning to 10 (elastic#21409)
  docs: add link to release notes for 7.9.2 (elastic#21405) (elastic#21419)
  docs: Prepare Changelog for 7.9.2 (elastic#21229) (elastic#21403)
  fix: mark flaky tests (elastic#21300)
  fix: use a fixed version of setuptools (elastic#21393)
  Move Kubernetes events metricset to its own block in reference config (elastic#21407)
  [libbeat] Enable WriteAheadLimit in the disk queue (elastic#21391)
  docs: fix apt/yum formatting (elastic#21362)
  ...
v1v added a commit to v1v/beats that referenced this pull request Oct 2, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/ci-pipeli…
83f8acf 
…ne-2.0-arm

* upstream/master: (54 commits)
  [CI] Change x-pack/auditbeat build events (comments, labels) (elastic#21463)
  [CI] changeset from elastic#20603 was not added to CI2.0 (elastic#21464)
  Add new log file reader for filestream input (elastic#21450)
  [CI] Send slack message with build status (elastic#21428)
  Remove duplicated sources url in dependencies report (elastic#21462)
  Add implementation of FSWatcher and FSScanner for filestream (elastic#21444)
  [Ingest Manager] Split index restrictions into type,dataset, namespace parts (elastic#21406)
  Update Filebeat module expected logs files (elastic#21454)
  Edit SQL module docs and fix broken doc structure (elastic#21233)
  [Ingest Manager] Send snapshot flag together with metadata (elastic#21285)
  Revert "[JJBB] Set shallow cloning to 10 (elastic#21409)" (elastic#21447)
  [JJBB] Use reference repo for fast checkouts (elastic#21410)
  Add initial skeleton of filestream input (elastic#21427)
  Initial spec file for apm-server (elastic#21225)
  [Ingest Manager] Upgrade Action: make source URI optional (elastic#21372)
  Add field limit check for AWS Cloudtrail flattened fields (elastic#21388)
  [Winlogbeat] Move winlogbeat javascript processor to libbeat (elastic#21402)
  ci: pipeline to generate the changelog (elastic#21426)
  [JJBB] Set shallow cloning to 10 (elastic#21409)
  docs: add link to release notes for 7.9.2 (elastic#21405) (elastic#21419)
  ...
v1v added a commit to v1v/beats that referenced this pull request Oct 2, 2020
@v1v
Merge remote-tracking branch 'upstream/master' into feature/2.0-skip-…
7c218ea 
…ci-build-label-support

* upstream/master:
  [CI] Change x-pack/auditbeat build events (comments, labels) (elastic#21463)
  [CI] changeset from elastic#20603 was not added to CI2.0 (elastic#21464)
  Add new log file reader for filestream input (elastic#21450)
  [CI] Send slack message with build status (elastic#21428)
  Remove duplicated sources url in dependencies report (elastic#21462)
  Add implementation of FSWatcher and FSScanner for filestream (elastic#21444)
  [Ingest Manager] Split index restrictions into type,dataset, namespace parts (elastic#21406)
  Update Filebeat module expected logs files (elastic#21454)
  Edit SQL module docs and fix broken doc structure (elastic#21233)
  [Ingest Manager] Send snapshot flag together with metadata (elastic#21285)
  Revert "[JJBB] Set shallow cloning to 10 (elastic#21409)" (elastic#21447)
  [JJBB] Use reference repo for fast checkouts (elastic#21410)
  Add initial skeleton of filestream input (elastic#21427)
  Initial spec file for apm-server (elastic#21225)
  [Ingest Manager] Upgrade Action: make source URI optional (elastic#21372)
  Add field limit check for AWS Cloudtrail flattened fields (elastic#21388)
  [Winlogbeat] Move winlogbeat javascript processor to libbeat (elastic#21402)
  ci: pipeline to generate the changelog (elastic#21426)
@jalvz jalvz mentioned this pull request Dec 1, 2020
Merged
jalvz added a commit to jalvz/beats that referenced this pull request Dec 1, 2020
@jalvz
Initial spec file for apm-server (elastic#21225)
1529163 
Start with Elasticsearch output only for now
jalvz added a commit that referenced this pull request Dec 15, 2020
@jalvz
Cherry-pick to 7.x: Initial spec file for apm-server (#21225) (#22811)
28e2ab2
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

Assignees
No one assigned
Labels
Agent Team:apm APM Server team issues/PRs
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jalvz @elasticmachine @ph @ruflin