Skip to content

Commit

Permalink
[7.x](backport #26885) Add missing outputs to apm server spec file (#…
Browse files Browse the repository at this point in the history
…27234)

(cherry picked from commit cf0cd20)

Co-authored-by: Steffen Siering <[email protected]>
  • Loading branch information
mergify[bot] and Steffen Siering authored Aug 9, 2021
1 parent 7d18dd4 commit 2e583b5
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions x-pack/elastic-agent/CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
- Do not log Elasticsearch configuration for monitoring output when running with debug. {pull}26583[26583]
- Fix issue where proxy enrollment options broke enrollment command. {pull}26749[26749]
- Remove symlink.prev from previously failed upgrade {pull}26785[26785]
- Fix apm-server supported outputs not being in sync with supported output types. {pull}26885[26885]
- Set permissions during installation {pull}26665[26665]

==== New features
Expand Down
2 changes: 1 addition & 1 deletion x-pack/elastic-agent/pkg/agent/program/supported.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion x-pack/elastic-agent/spec/apm-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,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')

0 comments on commit 2e583b5

Please sign in to comment.