Skip to content

Commit

Permalink
docs: move location of Jaeger docs
Browse files Browse the repository at this point in the history
  • Loading branch information
bmorelli25 committed Feb 4, 2020
1 parent c095c8f commit 2871e33
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
5 changes: 4 additions & 1 deletion docs/configuring.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ include::{libbeat-dir}/shared-configuring.asciidoc[]
* <<configuration-logging>>
* <<setup-kibana-endpoint>>
* <<configuration-rum>>
* <<jaeger>>
* <<using-environ-vars>>
* <<configuration-path>>
--
Expand All @@ -39,7 +40,7 @@ Additional information on getting started with SSL/TLS is available in <<securin
// the specified number of levels. It is required here because the shared Beats
// documentation was created as a level 1 heading. In the APM book, this level
// would break the DTD. Using leveloffset +1, we can include this file here.
// It's important too reset the level heading after including the file.
// It's important to reset the level heading after including a file.
:leveloffset: +1
include::{libbeat-dir}/shared-ssl-config.asciidoc[]
:leveloffset: -1
Expand All @@ -58,6 +59,8 @@ include::./configure-kibana-endpoint.asciidoc[]

include::./configuration-rum.asciidoc[]

include::./jaeger-support.asciidoc[]

:standalone:
include::{libbeat-dir}/shared-env-vars.asciidoc[]

Expand Down
9 changes: 3 additions & 6 deletions docs/getting-started-apm-server.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -353,15 +353,12 @@ If you haven't already, you can now install APM Agents in your services!
* {apm-rum-ref-v}/intro.html[JavaScript Real User Monitoring (RUM) agent]

Once you have at least one Agent sending data to APM Server,
you can start visualizing your data in the {kibana-ref}/xpack-apm.html[Kibana APM UI].
you can start visualizing your data in the {kibana-ref}/xpack-apm.html[APM app].

If you're migrating from Jaeger, see <<jaeger>>.

// Shared APM & YUM
include::{libbeat-dir}/repositories.asciidoc[]

// Shared docker
include::{libbeat-dir}/shared-docker.asciidoc[]

// APM Jaeger integration
ifdef::apm-server[]
include::./jaeger-support.asciidoc[]
endif::[]

0 comments on commit 2871e33

Please sign in to comment.