Skip to content

Commit ee9f811

Browse files
authored
Merge pull request #81 from simitt/docs-add-apm-server
[DOCS] Add APM Server.
2 parents 0c04c51 + bd24815 commit ee9f811

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

docs/index.asciidoc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ to simplify the installation and upgrade process. The full stack
1212
consists of:
1313

1414
* {beats-ref}/index.html[Beats {branch}]
15+
* {apm-server-ref}/index.html[APM Server {branch}]
1516
* {ref}/index.html[Elasticsearch {branch}]
1617
* {hadoop-ref}/index.html[Elasticsearch Hadoop {branch}]
1718
* {kibana-ref}/index.html[Kibana {branch}]

docs/installing-stack.asciidoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
When installing the Elastic Stack, you must use the same version
55
across the entire stack. For example, if you are using Elasticsearch
6-
{version}, you install Beats {version}, Elasticsearch Hadoop {version},
6+
{version}, you install Beats {version}, APM Server {version}, Elasticsearch Hadoop {version},
77
Kibana {version}, and Logstash {version}.
88

99
If you're upgrading an existing installation, see <<upgrading-elastic-stack, Upgrading the Elastic Stack>> for information about how to ensure compatibility with {version}.
@@ -17,6 +17,7 @@ Install the Elastic Stack products you want to use in the following order:
1717
. Kibana ({kibana-ref}/install.html[install])
1818
. Logstash ({logstash-ref}/installing-logstash.html[install])
1919
. Beats ({beats-ref}/getting-started.html[install instructions])
20+
. APM Server ({apm-server-ref}/installing.html[install instructions])
2021
. Elasticsearch Hadoop ({hadoop-ref}/install.html[install instructions])
2122

2223
Installing in this order ensures that the components each product depends

docs/upgrading-stack.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ and make the necessary changes so your code is compatible with {version}:
4545
+
4646
--
4747
** {beats-ref}/breaking-changes.html[Beats {version} breaking changes]
48+
** {apm-server-ref}/breaking-changes.html[APM Server {version} breaking changes]
4849
** {ref}/breaking-changes.html[Elasticsearch {version} breaking changes]
4950
** {hadoop-ref}/breaking-changes.html[Elasticsearch Hadoop {version} breaking changes]
5051
** {kibana-ref}/breaking-changes.html[Kibana {version} breaking changes]
@@ -103,6 +104,7 @@ Upgrade the Elastic Stack products you use in the following order:
103104
. Kibana: {kibana-ref}/upgrade.html[upgrade instructions]
104105
. Logstash: {logstash-ref}/upgrading-logstash.html[upgrade instructions]
105106
. Beats: {beats-ref}/upgrading.html[upgrade instructions]
107+
. APM Server: {apm-server-ref}/upgrading.html[upgrade instructions]
106108

107109
NOTE: Logstash 5.6 and 6.n and Beats 5.6 and 6.n are compatible with all 6.n versions of
108110
Elasticsearch. This provides flexibility in when you schedule the upgrades

0 commit comments

Comments
 (0)