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 package settings and icon #4542

Merged
merged 5 commits into from
Dec 16, 2020

Conversation

jalvz
Copy link
Contributor

@jalvz jalvz commented Dec 15, 2020

Motivation/summary

This makes host and secret_token configurable, primarily for the Docker use case.

While at it, it also adds the APM icon

Checklist

I have considered changes for:

How to test these changes

Related issues

Closes #4540

Partially implements #4495

Screenshots

Screenshot 2020-12-15 at 17 54 17

Screenshot 2020-12-15 at 17 52 54

Screenshot 2020-12-15 at 17 53 51

@jalvz jalvz requested review from axw and simitt December 15, 2020 17:01
@apmmachine
Copy link
Contributor

apmmachine commented Dec 15, 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: Branch indexing

  • Start Time: 2020-12-16T02:50:15.129+0000

  • Duration: 47 min 11 sec

Test stats 🧪

Test Results
Failed 0
Passed 4613
Skipped 124
Total 4737

Steps errors 4

Expand to view the steps failures

Run Window tests
  • Took 9 min 14 sec . View more details on here
Compress
  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=coverage-files.tgz -czf coverage-files.tgz coverage
Compress
  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=system-tests-linux-files.tgz -czf system-tests-linux-files.tgz system-tests
Test Sync
  • Took 3 min 15 sec . View more details on here
  • Description: ./.ci/scripts/sync.sh

@@ -7,6 +7,7 @@ The APM integration installs Elasticsearch templates and Ingest Node pipelines f
When you add an APM integration to a policy, that policy will contain an `apm` input.
If a policy contains an `apm` input, any Elastic Agent(s) set up with that policy will run locally an APM Server binary.
You must configure your APM Agents to communicate with that APM Server.
If you run Elastic Agent in Docker, make sure to configure the APM Server `host` accordingly if it needs to be accessed from outside.
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: this is not only for Docker, also when it should be reachable outside of localhost.

@codecov-io
Copy link

Codecov Report

Merging #4542 (20461e9) into master (736812b) will decrease coverage by 0.09%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #4542      +/-   ##
==========================================
- Coverage   75.98%   75.89%   -0.10%     
==========================================
  Files         161      161              
  Lines        9789     9789              
==========================================
- Hits         7438     7429       -9     
- Misses       2351     2360       +9     
Impacted Files Coverage Δ
publish/acker.go 78.94% <0.00%> (-10.53%) ⬇️
kibana/connecting_client.go 61.40% <0.00%> (-8.78%) ⬇️
processor/otel/consumer.go 93.51% <0.00%> (-0.45%) ⬇️

@jalvz jalvz merged commit 18c59de into elastic:master Dec 16, 2020
@axw axw self-assigned this Dec 21, 2020
@axw
Copy link
Member

axw commented Dec 21, 2020

Tested with 7.11 BC1, using apm-integration-testing with a small patch to make --with-elastic-agent work with --bc: elastic/apm-integration-testing#1011. I manually configured kibana (through config/kibana.yml) to use the snapshot registry:

xpack.fleet.registryUrl: 'https://epr-staging.elastic.co'

The integration shows up with the icon:

image

host and secret_token show up in the settings, but secret_token is incorrectly defined to be a bool:

image

axw pushed a commit to axw/apm-server that referenced this pull request Feb 18, 2021
# Conflicts:
#	apmpackage/apm/0.1.0/agent/input/template.yml.hbs
#	apmpackage/apm/0.1.0/docs/README.md
#	apmpackage/apm/0.1.0/manifest.yml
#	apmpackage/docs/README.template.md
axw added a commit that referenced this pull request Feb 18, 2021
# Conflicts:
#	apmpackage/apm/0.1.0/agent/input/template.yml.hbs
#	apmpackage/apm/0.1.0/docs/README.md
#	apmpackage/apm/0.1.0/manifest.yml
#	apmpackage/docs/README.template.md

Co-authored-by: Juan Álvarez <[email protected]>
axw added a commit to axw/apm-server that referenced this pull request Feb 19, 2021
# Conflicts:
#	apmpackage/apm/0.1.0/agent/input/template.yml.hbs
#	apmpackage/apm/0.1.0/docs/README.md
#	apmpackage/apm/0.1.0/manifest.yml
#	apmpackage/docs/README.template.md

Co-authored-by: Juan Álvarez <[email protected]>
axw pushed a commit to axw/apm-server that referenced this pull request Feb 19, 2021
# Conflicts:
#	apmpackage/apm/0.1.0/_dev/docs/README.template.md
#	apmpackage/apm/0.1.0/agent/input/template.yml.hbs
#	apmpackage/apm/0.1.0/docs/README.md
#	apmpackage/apm/0.1.0/manifest.yml
axw added a commit that referenced this pull request Feb 19, 2021
# Conflicts:
#	apmpackage/apm/0.1.0/_dev/docs/README.template.md
#	apmpackage/apm/0.1.0/agent/input/template.yml.hbs
#	apmpackage/apm/0.1.0/docs/README.md
#	apmpackage/apm/0.1.0/manifest.yml

Co-authored-by: Juan Álvarez <[email protected]>
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.

[Elastic Agent] Support apm-server.host config option
5 participants