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

Add missing outputs to apm server spec file #26885

Merged
merged 5 commits into from
Aug 4, 2021
Merged

Add missing outputs to apm server spec file #26885

merged 5 commits into from
Aug 4, 2021

Conversation

urso
Copy link

@urso urso commented Jul 14, 2021

  • Bug

What does this PR do?

  • Add missing outputs to apm-server spec file.

Why is it important?

Parity with other spec files for services based on libbeat.

@urso urso added Team:Elastic-Agent Label for the Agent team backport-v7.14.0 Automated backport with mergify backport-v7.15.0 Automated backport with mergify labels Jul 14, 2021
@elasticmachine
Copy link
Collaborator

Pinging @elastic/agent (Team:Agent)

@botelastic botelastic bot added needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jul 14, 2021
@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 14, 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-08-02T12:07:53.901+0000

  • Duration: 83 min 12 sec

  • Commit: 4bf3967

Test stats 🧪

Test Results
Failed 0
Passed 7012
Skipped 16
Total 7028

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 7012
Skipped 16
Total 7028

simitt
simitt reviewed Jul 15, 2021
View reviewed changes
x-pack/elastic-agent/spec/apm-server.yml
@@ -32,4 +32,5 @@ rules:
- output
- fleet
- inject_headers: {}
when: length(${inputs}) > 0 and hasKey(${output}, 'elasticsearch')
when: length(${inputs}) > 0 and hasKey(${output}, 'elasticsearch', 'redis',
'kafka', 'logstash')
Copy link
Contributor

Choose a reason for hiding this comment

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

My information was that redis will not be supported for now?

Copy link
Author

Choose a reason for hiding this comment

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

just copy and paste from the other Beats. I would like to keep all libbeat based process types in sync. Removing redis should be done separately.

michalpristas
michalpristas approved these changes Jul 15, 2021
View reviewed changes
Copy link
Contributor

@michalpristas michalpristas left a comment

Choose a reason for hiding this comment

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

please add changelog, lgtm
silvia has some copy rules with elasticsearch hardcoded (not in just yet), we need to verify later on if this wont' fail if ES is missing

@urso
Copy link
Author

urso commented Jul 15, 2021

silvia has some copy rules with elasticsearch hardcoded (not in just yet), we need to verify later on if this wont' fail if ES is missing

This might be a problem in general. The condition is only executed at the end. If users have configured LS, that might still fail even before we hit the condition.

@michalpristas
Copy link
Contributor

michalpristas commented Jul 15, 2021 •
edited
Loading

This might be a problem in general. The condition is only executed at the end. If users have configured LS, that might still fail even before we hit the condition.

yeah we just need to make sure it wont panics. if it's missing it should be noop.

@mergify
Copy link
Contributor

mergify bot commented Jul 16, 2021

This pull request is now in conflicts. Could you fix it? 🙏
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 apm-server-outputs upstream/apm-server-outputs
git merge upstream/master
git push upstream apm-server-outputs

@urso urso merged commit cf0cd20 into elastic:master Aug 4, 2021
@urso urso deleted the apm-server-outputs branch August 4, 2021 14:44
mergify bot pushed a commit that referenced this pull request Aug 4, 2021
Add missing outputs to apm server spec file (#26885)
2adfb8d 
(cherry picked from commit cf0cd20)
@mergify mergify bot mentioned this pull request Aug 4, 2021
Merged
mergify bot pushed a commit that referenced this pull request Aug 4, 2021
Add missing outputs to apm server spec file (#26885)
fa10c2d 
(cherry picked from commit cf0cd20)

# Conflicts:
#	x-pack/elastic-agent/pkg/agent/program/supported.go
@mergify mergify bot mentioned this pull request Aug 4, 2021
Merged
urso pushed a commit that referenced this pull request Aug 9, 2021
@mergify
[7.x](backport #26885) Add missing outputs to apm server spec file (#…
2e583b5 
…27234)

(cherry picked from commit cf0cd20)

Co-authored-by: Steffen Siering <[email protected]>
urso pushed a commit that referenced this pull request Aug 10, 2021
@mergify
[7.14](backport #26885) Add missing outputs to apm server spec file (#…
15b9763 
…27235)

Co-authored-by: Steffen Siering <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@simitt simitt simitt left review comments

@michalpristas michalpristas michalpristas approved these changes

Assignees
No one assigned
Labels
backport-v7.14.0 Automated backport with mergify backport-v7.15.0 Automated backport with mergify Team:Elastic-Agent Label for the Agent team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@urso @elasticmachine @michalpristas @simitt