From 6feb231f10864bd5f5df01e29f903b4c4a815060 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Fri, 13 Sep 2019 09:08:22 +0200 Subject: [PATCH 01/11] docs: add APM Agent versions --- shared/versions/stack/6.3.asciidoc | 5 +++++ shared/versions/stack/6.4.asciidoc | 5 +++++ shared/versions/stack/6.5.asciidoc | 8 ++++++++ shared/versions/stack/6.6.asciidoc | 8 ++++++++ shared/versions/stack/6.7.asciidoc | 8 ++++++++ shared/versions/stack/6.8.asciidoc | 8 ++++++++ shared/versions/stack/7.0.asciidoc | 8 ++++++++ shared/versions/stack/7.1.asciidoc | 8 ++++++++ shared/versions/stack/7.2.asciidoc | 9 +++++++++ shared/versions/stack/7.3.asciidoc | 11 ++++++++++- shared/versions/stack/7.4.asciidoc | 9 +++++++++ shared/versions/stack/7.x.asciidoc | 9 +++++++++ shared/versions/stack/master.asciidoc | 8 ++++++++ 13 files changed, 103 insertions(+), 1 deletion(-) diff --git a/shared/versions/stack/6.3.asciidoc b/shared/versions/stack/6.3.asciidoc index 9790253bd9900..fdf7ad5e53b15 100644 --- a/shared/versions/stack/6.3.asciidoc +++ b/shared/versions/stack/6.3.asciidoc @@ -11,3 +11,8 @@ release-state can be: released | prerelease | unreleased ////////// :release-state: released + +// APM Agent versions +:apm-rum-branch: 0.x +:apm-node-branch: 1.x +:apm-py-branch: 3.x diff --git a/shared/versions/stack/6.4.asciidoc b/shared/versions/stack/6.4.asciidoc index 046ed74e67a4a..8fe2934612ceb 100644 --- a/shared/versions/stack/6.4.asciidoc +++ b/shared/versions/stack/6.4.asciidoc @@ -11,3 +11,8 @@ release-state can be: released | prerelease | unreleased ////////// :release-state: released + +// APM Agent versions +:apm-rum-branch: 0.x +:apm-node-branch: 1.x +:apm-py-branch: 3.x diff --git a/shared/versions/stack/6.5.asciidoc b/shared/versions/stack/6.5.asciidoc index dc31945ed4920..5e2d960d3deb9 100644 --- a/shared/versions/stack/6.5.asciidoc +++ b/shared/versions/stack/6.5.asciidoc @@ -11,3 +11,11 @@ release-state can be: released | prerelease | unreleased ////////// :release-state: released + +// APM Agent versions +:apm-go-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 2.x +:apm-node-branch: 2.x +:apm-py-branch: 4.x +:apm-ruby-branch: 2.x diff --git a/shared/versions/stack/6.6.asciidoc b/shared/versions/stack/6.6.asciidoc index 5c1627f4f23cf..dfa43114a205a 100644 --- a/shared/versions/stack/6.6.asciidoc +++ b/shared/versions/stack/6.6.asciidoc @@ -11,3 +11,11 @@ release-state can be: released | prerelease | unreleased ////////// :release-state: released + +// APM Agent versions +:apm-go-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 3.x +:apm-node-branch: 2.x +:apm-py-branch: 4.x +:apm-ruby-branch: 2.x diff --git a/shared/versions/stack/6.7.asciidoc b/shared/versions/stack/6.7.asciidoc index ec2a5af978591..7cb86c37694a5 100644 --- a/shared/versions/stack/6.7.asciidoc +++ b/shared/versions/stack/6.7.asciidoc @@ -11,3 +11,11 @@ release-state can be: released | prerelease | unreleased ////////// :release-state: released + +// APM Agent versions +:apm-go-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 3.x +:apm-node-branch: 2.x +:apm-py-branch: 4.x +:apm-ruby-branch: 2.x diff --git a/shared/versions/stack/6.8.asciidoc b/shared/versions/stack/6.8.asciidoc index 43dc7a1c70a93..d9ca9507fff9b 100644 --- a/shared/versions/stack/6.8.asciidoc +++ b/shared/versions/stack/6.8.asciidoc @@ -15,3 +15,11 @@ release-state can be: released | prerelease | unreleased ////////// :release-state: released + +// APM Agent versions +:apm-go-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 3.x +:apm-node-branch: 2.x +:apm-py-branch: 4.x +:apm-ruby-branch: 2.x diff --git a/shared/versions/stack/7.0.asciidoc b/shared/versions/stack/7.0.asciidoc index 0b61d9d976e6d..71c6ba8b6c70b 100644 --- a/shared/versions/stack/7.0.asciidoc +++ b/shared/versions/stack/7.0.asciidoc @@ -16,3 +16,11 @@ release-state can be: released | prerelease | unreleased ////////// :release-state: released + +// APM Agent versions +:apm-go-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 4.x +:apm-node-branch: 2.x +:apm-py-branch: 4.x +:apm-ruby-branch: 2.x diff --git a/shared/versions/stack/7.1.asciidoc b/shared/versions/stack/7.1.asciidoc index 69c789748c77c..c2c39a1101c50 100644 --- a/shared/versions/stack/7.1.asciidoc +++ b/shared/versions/stack/7.1.asciidoc @@ -16,3 +16,11 @@ release-state can be: released | prerelease | unreleased ////////// :release-state: released + +// APM Agent versions +:apm-go-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 4.x +:apm-node-branch: 2.x +:apm-py-branch: 4.x +:apm-ruby-branch: 2.x diff --git a/shared/versions/stack/7.2.asciidoc b/shared/versions/stack/7.2.asciidoc index 88ed76e55e1ed..519d90020e60a 100644 --- a/shared/versions/stack/7.2.asciidoc +++ b/shared/versions/stack/7.2.asciidoc @@ -16,3 +16,12 @@ release-state can be: released | prerelease | unreleased ////////// :release-state: released + +// APM Agent versions +:apm-go-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 4.x +:apm-node-branch: 2.x +:apm-py-branch: 4.x +:apm-ruby-branch: 2.x +:apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.3.asciidoc b/shared/versions/stack/7.3.asciidoc index c9fd98fa69d62..e5f38b2e23a7d 100644 --- a/shared/versions/stack/7.3.asciidoc +++ b/shared/versions/stack/7.3.asciidoc @@ -15,4 +15,13 @@ bare_version never includes -alpha or -beta release-state can be: released | prerelease | unreleased ////////// -:release-state: released +:release-state: released + +// APM Agent versions +:apm-go-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 4.x +:apm-node-branch: 2.x +:apm-py-branch: 5.x +:apm-ruby-branch: 2.x +:apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.4.asciidoc b/shared/versions/stack/7.4.asciidoc index 1fdcbb2b15cf0..9f4af254d4f5b 100644 --- a/shared/versions/stack/7.4.asciidoc +++ b/shared/versions/stack/7.4.asciidoc @@ -16,3 +16,12 @@ release-state can be: released | prerelease | unreleased ////////// :release-state: unreleased + +// APM Agent versions +:apm-go-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 4.x +:apm-node-branch: 2.x +:apm-py-branch: 5.x +:apm-ruby-branch: 2.x +:apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.x.asciidoc b/shared/versions/stack/7.x.asciidoc index 72c1e1adf17d6..be3e750fb6310 100644 --- a/shared/versions/stack/7.x.asciidoc +++ b/shared/versions/stack/7.x.asciidoc @@ -16,3 +16,12 @@ release-state can be: released | prerelease | unreleased ////////// :release-state: unreleased + +// APM Agent versions +:apm-go-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 4.x +:apm-node-branch: 2.x +:apm-py-branch: 5.x +:apm-ruby-branch: 2.x +:apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index 7525c4f4a60bf..f2a10c228c454 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -17,3 +17,11 @@ release-state can be: released | prerelease | unreleased :release-state: unreleased +// APM Agent versions +:apm-go-branch: 1.x +:apm-java-branch: 1.x +:apm-rum-branch: 4.x +:apm-node-branch: 2.x +:apm-py-branch: 5.x +:apm-ruby-branch: 2.x +:apm-dotnet-branch: 1.x From f47ce20d46d0db1465ce11b65a0e2d3d35214eeb Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Fri, 13 Sep 2019 09:16:41 +0200 Subject: [PATCH 02/11] docs: add apm_server_version --- shared/versions/stack/6.0.asciidoc | 1 + shared/versions/stack/6.1.asciidoc | 1 + shared/versions/stack/6.2.asciidoc | 1 + shared/versions/stack/6.3.asciidoc | 1 + shared/versions/stack/6.4.asciidoc | 1 + shared/versions/stack/6.5.asciidoc | 1 + shared/versions/stack/6.6.asciidoc | 1 + shared/versions/stack/6.7.asciidoc | 1 + shared/versions/stack/6.8.asciidoc | 1 + shared/versions/stack/7.0.asciidoc | 1 + shared/versions/stack/7.1.asciidoc | 1 + shared/versions/stack/7.2.asciidoc | 1 + shared/versions/stack/7.3.asciidoc | 1 + shared/versions/stack/7.4.asciidoc | 1 + shared/versions/stack/7.x.asciidoc | 1 + shared/versions/stack/master.asciidoc | 1 + 16 files changed, 16 insertions(+) diff --git a/shared/versions/stack/6.0.asciidoc b/shared/versions/stack/6.0.asciidoc index d12b264a7014b..6b781752ddbab 100644 --- a/shared/versions/stack/6.0.asciidoc +++ b/shared/versions/stack/6.0.asciidoc @@ -2,6 +2,7 @@ :logstash_version: 6.0.1 :elasticsearch_version: 6.0.1 :kibana_version: 6.0.1 +:apm_server_version: 6.0.1 :branch: 6.0 :major-version: 6.x :prev-major-version: 5.x diff --git a/shared/versions/stack/6.1.asciidoc b/shared/versions/stack/6.1.asciidoc index b17c52a43e1bc..1110b8911cb8f 100644 --- a/shared/versions/stack/6.1.asciidoc +++ b/shared/versions/stack/6.1.asciidoc @@ -2,6 +2,7 @@ :logstash_version: 6.1.4 :elasticsearch_version: 6.1.4 :kibana_version: 6.1.4 +:apm_server_version: 6.1.4 :branch: 6.1 :major-version: 6.x :prev-major-version: 5.x diff --git a/shared/versions/stack/6.2.asciidoc b/shared/versions/stack/6.2.asciidoc index 0868ce85f2b2a..cfb7c895181cd 100644 --- a/shared/versions/stack/6.2.asciidoc +++ b/shared/versions/stack/6.2.asciidoc @@ -2,6 +2,7 @@ :logstash_version: 6.2.4 :elasticsearch_version: 6.2.4 :kibana_version: 6.2.4 +:apm_server_version: 6.2.4 :branch: 6.2 :major-version: 6.x :prev-major-version: 5.x diff --git a/shared/versions/stack/6.3.asciidoc b/shared/versions/stack/6.3.asciidoc index fdf7ad5e53b15..871a8657345eb 100644 --- a/shared/versions/stack/6.3.asciidoc +++ b/shared/versions/stack/6.3.asciidoc @@ -2,6 +2,7 @@ :logstash_version: 6.3.2 :elasticsearch_version: 6.3.2 :kibana_version: 6.3.2 +:apm_server_version: 6.3.2 :branch: 6.3 :major-version: 6.x :prev-major-version: 5.x diff --git a/shared/versions/stack/6.4.asciidoc b/shared/versions/stack/6.4.asciidoc index 8fe2934612ceb..02242ca90b4db 100644 --- a/shared/versions/stack/6.4.asciidoc +++ b/shared/versions/stack/6.4.asciidoc @@ -2,6 +2,7 @@ :logstash_version: 6.4.3 :elasticsearch_version: 6.4.3 :kibana_version: 6.4.3 +:apm_server_version: 6.4.3 :branch: 6.4 :major-version: 6.x :prev-major-version: 5.x diff --git a/shared/versions/stack/6.5.asciidoc b/shared/versions/stack/6.5.asciidoc index 5e2d960d3deb9..0a12421a67958 100644 --- a/shared/versions/stack/6.5.asciidoc +++ b/shared/versions/stack/6.5.asciidoc @@ -2,6 +2,7 @@ :logstash_version: 6.5.4 :elasticsearch_version: 6.5.4 :kibana_version: 6.5.4 +:apm_server_version: 6.5.4 :branch: 6.5 :major-version: 6.x :prev-major-version: 5.x diff --git a/shared/versions/stack/6.6.asciidoc b/shared/versions/stack/6.6.asciidoc index dfa43114a205a..f1efc9e43e89f 100644 --- a/shared/versions/stack/6.6.asciidoc +++ b/shared/versions/stack/6.6.asciidoc @@ -2,6 +2,7 @@ :logstash_version: 6.6.2 :elasticsearch_version: 6.6.2 :kibana_version: 6.6.2 +:apm_server_version: 6.6.2 :branch: 6.6 :major-version: 6.x :prev-major-version: 5.x diff --git a/shared/versions/stack/6.7.asciidoc b/shared/versions/stack/6.7.asciidoc index 7cb86c37694a5..d03c5408e6ee4 100644 --- a/shared/versions/stack/6.7.asciidoc +++ b/shared/versions/stack/6.7.asciidoc @@ -2,6 +2,7 @@ :logstash_version: 6.7.2 :elasticsearch_version: 6.7.2 :kibana_version: 6.7.2 +:apm_server_version: 6.7.2 :branch: 6.7 :major-version: 6.x :prev-major-version: 5.x diff --git a/shared/versions/stack/6.8.asciidoc b/shared/versions/stack/6.8.asciidoc index d9ca9507fff9b..96d91ff7f036a 100644 --- a/shared/versions/stack/6.8.asciidoc +++ b/shared/versions/stack/6.8.asciidoc @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta :logstash_version: 6.8.3 :elasticsearch_version: 6.8.3 :kibana_version: 6.8.3 +:apm_server_version: 6.8.3 :branch: 6.8 :major-version: 6.x :prev-major-version: 5.x diff --git a/shared/versions/stack/7.0.asciidoc b/shared/versions/stack/7.0.asciidoc index 71c6ba8b6c70b..d9b4a131b0021 100644 --- a/shared/versions/stack/7.0.asciidoc +++ b/shared/versions/stack/7.0.asciidoc @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta :logstash_version: 7.0.1 :elasticsearch_version: 7.0.1 :kibana_version: 7.0.1 +:apm_server_version: 7.0.1 :branch: 7.0 :major-version: 7.x :prev-major-version: 6.x diff --git a/shared/versions/stack/7.1.asciidoc b/shared/versions/stack/7.1.asciidoc index c2c39a1101c50..0b6cd315204ab 100644 --- a/shared/versions/stack/7.1.asciidoc +++ b/shared/versions/stack/7.1.asciidoc @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta :logstash_version: 7.1.1 :elasticsearch_version: 7.1.1 :kibana_version: 7.1.1 +:apm_server_version: 7.1.1 :branch: 7.1 :major-version: 7.x :prev-major-version: 6.x diff --git a/shared/versions/stack/7.2.asciidoc b/shared/versions/stack/7.2.asciidoc index 519d90020e60a..d0edf5e7cde2f 100644 --- a/shared/versions/stack/7.2.asciidoc +++ b/shared/versions/stack/7.2.asciidoc @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta :logstash_version: 7.2.1 :elasticsearch_version: 7.2.1 :kibana_version: 7.2.1 +:apm_server_version: 7.2.1 :branch: 7.2 :major-version: 7.x :prev-major-version: 6.x diff --git a/shared/versions/stack/7.3.asciidoc b/shared/versions/stack/7.3.asciidoc index e5f38b2e23a7d..ecf9a487aaabe 100644 --- a/shared/versions/stack/7.3.asciidoc +++ b/shared/versions/stack/7.3.asciidoc @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta :logstash_version: 7.3.2 :elasticsearch_version: 7.3.2 :kibana_version: 7.3.2 +:apm_server_version: 7.3.2 :branch: 7.3 :major-version: 7.x :prev-major-version: 6.x diff --git a/shared/versions/stack/7.4.asciidoc b/shared/versions/stack/7.4.asciidoc index 9f4af254d4f5b..88a5d8a4ed0b3 100644 --- a/shared/versions/stack/7.4.asciidoc +++ b/shared/versions/stack/7.4.asciidoc @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta :logstash_version: 7.4.0 :elasticsearch_version: 7.4.0 :kibana_version: 7.4.0 +:apm_server_version: 7.4.0 :branch: 7.4 :major-version: 7.x :prev-major-version: 6.x diff --git a/shared/versions/stack/7.x.asciidoc b/shared/versions/stack/7.x.asciidoc index be3e750fb6310..a86241d32f839 100644 --- a/shared/versions/stack/7.x.asciidoc +++ b/shared/versions/stack/7.x.asciidoc @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta :logstash_version: 7.5.0 :elasticsearch_version: 7.5.0 :kibana_version: 7.5.0 +:apm_server_version: 7.5.0 :branch: 7.x :major-version: 7.x :prev-major-version: 6.x diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index f2a10c228c454..c33ffb9114e8d 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -6,6 +6,7 @@ bare_version never includes -alpha or -beta :logstash_version: 8.0.0 :elasticsearch_version: 8.0.0 :kibana_version: 8.0.0 +:apm_server_version: 8.0.0 :branch: master :major-version: 8.x :prev-major-version: 7.x From 3df9456e0f37a8feedcfaf9b891d374dfe3e077b Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Fri, 13 Sep 2019 09:37:40 +0200 Subject: [PATCH 03/11] docs: update APM shared attributes --- shared/attributes.asciidoc | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 9b6b624cd7d60..875cca051d51c 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -18,25 +18,34 @@ :winlogbeat-ref: https://www.elastic.co/guide/en/beats/winlogbeat/{branch} :heartbeat-ref: https://www.elastic.co/guide/en/beats/heartbeat/{branch} :journalbeat-ref: https://www.elastic.co/guide/en/beats/journalbeat/{branch} -:apm-get-started-ref: https://www.elastic.co/guide/en/apm/get-started/{branch} :apm-overview-ref-v: https://www.elastic.co/guide/en/apm/get-started/{branch} :apm-overview-ref-70: https://www.elastic.co/guide/en/apm/get-started/7.0 -:apm-server-ref: https://www.elastic.co/guide/en/apm/server/{branch} :apm-server-ref-v: https://www.elastic.co/guide/en/apm/server/{branch} -:apm-server-ref-62: https://www.elastic.co/guide/en/apm/server/6.2 -:apm-server-ref-64: https://www.elastic.co/guide/en/apm/server/6.4 :apm-server-ref-70: https://www.elastic.co/guide/en/apm/server/7.0 +:apm-server-ref-64: https://www.elastic.co/guide/en/apm/server/6.4 +:apm-server-ref-62: https://www.elastic.co/guide/en/apm/server/6.2 :apm-agents-ref: https://www.elastic.co/guide/en/apm/agent +:apm-py-ref-v: https://www.elastic.co/guide/en/apm/agent/python/{apm-py-branch} +:apm-node-ref-v: https://www.elastic.co/guide/en/apm/agent/nodejs/{apm-node-branch} +:apm-rum-ref-v: https://www.elastic.co/guide/en/apm/agent/rum-js/{apm-rum-branch} +:apm-ruby-ref-v: https://www.elastic.co/guide/en/apm/agent/ruby/{apm-ruby-branch} +:apm-java-ref-v: https://www.elastic.co/guide/en/apm/agent/java/{apm-java-branch} +:apm-go-ref-v: https://www.elastic.co/guide/en/apm/agent/go/{apm-go-branch} +:apm-dotnet-ref-v: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch} +// Begin outdated APM attributes +:apm-get-started-ref: https://www.elastic.co/guide/en/apm/get-started/{branch} +:apm-server-ref: https://www.elastic.co/guide/en/apm/server/{branch} :apm-py-ref: https://www.elastic.co/guide/en/apm/agent/python/current :apm-py-ref-3x: https://www.elastic.co/guide/en/apm/agent/python/3.x -:apm-node-ref-index: https://www.elastic.co/guide/en/apm/agent/nodejs :apm-node-ref: https://www.elastic.co/guide/en/apm/agent/nodejs/current +:apm-node-ref-index: https://www.elastic.co/guide/en/apm/agent/nodejs :apm-node-ref-1x: https://www.elastic.co/guide/en/apm/agent/nodejs/1.x :apm-rum-ref: https://www.elastic.co/guide/en/apm/agent/rum-js/current :apm-ruby-ref: https://www.elastic.co/guide/en/apm/agent/ruby/current :apm-java-ref: https://www.elastic.co/guide/en/apm/agent/java/current :apm-go-ref: https://www.elastic.co/guide/en/apm/agent/go/current :apm-dotnet-ref: https://www.elastic.co/guide/en/apm/agent/dotnet/current +// End outdated APM attributes :hadoop-ref: https://www.elastic.co/guide/en/elasticsearch/hadoop/{branch} :stack-ref: http://www.elastic.co/guide/en/elastic-stack/{branch} :stack-ref-67: http://www.elastic.co/guide/en/elastic-stack/6.7 @@ -204,4 +213,3 @@ :api-example-title: Example :api-examples-title: Examples :api-definitions-title: Properties - From b8905bcc383360633e62ff74921825504d98db58 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Fri, 13 Sep 2019 11:02:08 +0200 Subject: [PATCH 04/11] docs: update agents to current versions --- shared/versions/stack/6.5.asciidoc | 1 + shared/versions/stack/6.6.asciidoc | 3 ++- shared/versions/stack/6.7.asciidoc | 5 +++-- shared/versions/stack/6.8.asciidoc | 5 +++-- shared/versions/stack/7.0.asciidoc | 3 ++- shared/versions/stack/7.1.asciidoc | 3 ++- shared/versions/stack/7.2.asciidoc | 2 +- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/shared/versions/stack/6.5.asciidoc b/shared/versions/stack/6.5.asciidoc index 0a12421a67958..1dff3cd898118 100644 --- a/shared/versions/stack/6.5.asciidoc +++ b/shared/versions/stack/6.5.asciidoc @@ -20,3 +20,4 @@ release-state can be: released | prerelease | unreleased :apm-node-branch: 2.x :apm-py-branch: 4.x :apm-ruby-branch: 2.x +:apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/6.6.asciidoc b/shared/versions/stack/6.6.asciidoc index f1efc9e43e89f..260ddde54239d 100644 --- a/shared/versions/stack/6.6.asciidoc +++ b/shared/versions/stack/6.6.asciidoc @@ -18,5 +18,6 @@ release-state can be: released | prerelease | unreleased :apm-java-branch: 1.x :apm-rum-branch: 3.x :apm-node-branch: 2.x -:apm-py-branch: 4.x +:apm-py-branch: 5.x :apm-ruby-branch: 2.x +:apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/6.7.asciidoc b/shared/versions/stack/6.7.asciidoc index d03c5408e6ee4..06dc3c61d20e9 100644 --- a/shared/versions/stack/6.7.asciidoc +++ b/shared/versions/stack/6.7.asciidoc @@ -16,7 +16,8 @@ release-state can be: released | prerelease | unreleased // APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x -:apm-rum-branch: 3.x +:apm-rum-branch: 4.x :apm-node-branch: 2.x -:apm-py-branch: 4.x +:apm-py-branch: 5.x :apm-ruby-branch: 2.x +:apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/6.8.asciidoc b/shared/versions/stack/6.8.asciidoc index 96d91ff7f036a..1af0e8cdc336c 100644 --- a/shared/versions/stack/6.8.asciidoc +++ b/shared/versions/stack/6.8.asciidoc @@ -20,7 +20,8 @@ release-state can be: released | prerelease | unreleased // APM Agent versions :apm-go-branch: 1.x :apm-java-branch: 1.x -:apm-rum-branch: 3.x +:apm-rum-branch: 4.x :apm-node-branch: 2.x -:apm-py-branch: 4.x +:apm-py-branch: 5.x :apm-ruby-branch: 2.x +:apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.0.asciidoc b/shared/versions/stack/7.0.asciidoc index d9b4a131b0021..4a1dde6e2dd87 100644 --- a/shared/versions/stack/7.0.asciidoc +++ b/shared/versions/stack/7.0.asciidoc @@ -23,5 +23,6 @@ release-state can be: released | prerelease | unreleased :apm-java-branch: 1.x :apm-rum-branch: 4.x :apm-node-branch: 2.x -:apm-py-branch: 4.x +:apm-py-branch: 5.x :apm-ruby-branch: 2.x +:apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.1.asciidoc b/shared/versions/stack/7.1.asciidoc index 0b6cd315204ab..8268ed46a2c4e 100644 --- a/shared/versions/stack/7.1.asciidoc +++ b/shared/versions/stack/7.1.asciidoc @@ -23,5 +23,6 @@ release-state can be: released | prerelease | unreleased :apm-java-branch: 1.x :apm-rum-branch: 4.x :apm-node-branch: 2.x -:apm-py-branch: 4.x +:apm-py-branch: 5.x :apm-ruby-branch: 2.x +:apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/7.2.asciidoc b/shared/versions/stack/7.2.asciidoc index d0edf5e7cde2f..0e7e86fcf65ec 100644 --- a/shared/versions/stack/7.2.asciidoc +++ b/shared/versions/stack/7.2.asciidoc @@ -23,6 +23,6 @@ release-state can be: released | prerelease | unreleased :apm-java-branch: 1.x :apm-rum-branch: 4.x :apm-node-branch: 2.x -:apm-py-branch: 4.x +:apm-py-branch: 5.x :apm-ruby-branch: 2.x :apm-dotnet-branch: 1.x From 11b03a5ebe2e6cb91223f970671f9dbccb3dece1 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 16 Sep 2019 09:55:48 +0200 Subject: [PATCH 05/11] docs: deprecate -v attributes --- shared/attributes.asciidoc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 875cca051d51c..ca49484118489 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -25,26 +25,26 @@ :apm-server-ref-64: https://www.elastic.co/guide/en/apm/server/6.4 :apm-server-ref-62: https://www.elastic.co/guide/en/apm/server/6.2 :apm-agents-ref: https://www.elastic.co/guide/en/apm/agent +:apm-dotnet-ref: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch} +:apm-go-ref: https://www.elastic.co/guide/en/apm/agent/go/{apm-go-branch} +:apm-java-ref: https://www.elastic.co/guide/en/apm/agent/java/{apm-java-branch} +:apm-node-ref: https://www.elastic.co/guide/en/apm/agent/nodejs/{apm-node-branch} +:apm-py-ref: https://www.elastic.co/guide/en/apm/agent/python/{apm-py-branch} +:apm-ruby-ref: https://www.elastic.co/guide/en/apm/agent/ruby/{apm-ruby-branch} +:apm-rum-ref: https://www.elastic.co/guide/en/apm/agent/rum-js/{apm-rum-branch} +// Begin outdated APM attributes :apm-py-ref-v: https://www.elastic.co/guide/en/apm/agent/python/{apm-py-branch} +:apm-py-ref-3x: https://www.elastic.co/guide/en/apm/agent/python/3.x :apm-node-ref-v: https://www.elastic.co/guide/en/apm/agent/nodejs/{apm-node-branch} :apm-rum-ref-v: https://www.elastic.co/guide/en/apm/agent/rum-js/{apm-rum-branch} :apm-ruby-ref-v: https://www.elastic.co/guide/en/apm/agent/ruby/{apm-ruby-branch} :apm-java-ref-v: https://www.elastic.co/guide/en/apm/agent/java/{apm-java-branch} :apm-go-ref-v: https://www.elastic.co/guide/en/apm/agent/go/{apm-go-branch} :apm-dotnet-ref-v: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch} -// Begin outdated APM attributes :apm-get-started-ref: https://www.elastic.co/guide/en/apm/get-started/{branch} :apm-server-ref: https://www.elastic.co/guide/en/apm/server/{branch} -:apm-py-ref: https://www.elastic.co/guide/en/apm/agent/python/current -:apm-py-ref-3x: https://www.elastic.co/guide/en/apm/agent/python/3.x -:apm-node-ref: https://www.elastic.co/guide/en/apm/agent/nodejs/current :apm-node-ref-index: https://www.elastic.co/guide/en/apm/agent/nodejs :apm-node-ref-1x: https://www.elastic.co/guide/en/apm/agent/nodejs/1.x -:apm-rum-ref: https://www.elastic.co/guide/en/apm/agent/rum-js/current -:apm-ruby-ref: https://www.elastic.co/guide/en/apm/agent/ruby/current -:apm-java-ref: https://www.elastic.co/guide/en/apm/agent/java/current -:apm-go-ref: https://www.elastic.co/guide/en/apm/agent/go/current -:apm-dotnet-ref: https://www.elastic.co/guide/en/apm/agent/dotnet/current // End outdated APM attributes :hadoop-ref: https://www.elastic.co/guide/en/elasticsearch/hadoop/{branch} :stack-ref: http://www.elastic.co/guide/en/elastic-stack/{branch} From f0a2c99ca23fbfc622a1919451589010e5932d9e Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 16 Sep 2019 09:56:58 +0200 Subject: [PATCH 06/11] docs: clarification --- shared/attributes.asciidoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index ca49484118489..2d19ca5b1f789 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -32,7 +32,7 @@ :apm-py-ref: https://www.elastic.co/guide/en/apm/agent/python/{apm-py-branch} :apm-ruby-ref: https://www.elastic.co/guide/en/apm/agent/ruby/{apm-ruby-branch} :apm-rum-ref: https://www.elastic.co/guide/en/apm/agent/rum-js/{apm-rum-branch} -// Begin outdated APM attributes +// Begin deprecated APM attributes :apm-py-ref-v: https://www.elastic.co/guide/en/apm/agent/python/{apm-py-branch} :apm-py-ref-3x: https://www.elastic.co/guide/en/apm/agent/python/3.x :apm-node-ref-v: https://www.elastic.co/guide/en/apm/agent/nodejs/{apm-node-branch} @@ -45,7 +45,7 @@ :apm-server-ref: https://www.elastic.co/guide/en/apm/server/{branch} :apm-node-ref-index: https://www.elastic.co/guide/en/apm/agent/nodejs :apm-node-ref-1x: https://www.elastic.co/guide/en/apm/agent/nodejs/1.x -// End outdated APM attributes +// End deprecated APM attributes :hadoop-ref: https://www.elastic.co/guide/en/elasticsearch/hadoop/{branch} :stack-ref: http://www.elastic.co/guide/en/elastic-stack/{branch} :stack-ref-67: http://www.elastic.co/guide/en/elastic-stack/6.7 From a780e3c4447a8dcdfaba609abe7831e18414f907 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Mon, 16 Sep 2019 11:53:33 +0200 Subject: [PATCH 07/11] add apm-server and apm-over refs --- shared/attributes.asciidoc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 2d19ca5b1f789..41c58856bad07 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -18,12 +18,8 @@ :winlogbeat-ref: https://www.elastic.co/guide/en/beats/winlogbeat/{branch} :heartbeat-ref: https://www.elastic.co/guide/en/beats/heartbeat/{branch} :journalbeat-ref: https://www.elastic.co/guide/en/beats/journalbeat/{branch} -:apm-overview-ref-v: https://www.elastic.co/guide/en/apm/get-started/{branch} -:apm-overview-ref-70: https://www.elastic.co/guide/en/apm/get-started/7.0 -:apm-server-ref-v: https://www.elastic.co/guide/en/apm/server/{branch} -:apm-server-ref-70: https://www.elastic.co/guide/en/apm/server/7.0 -:apm-server-ref-64: https://www.elastic.co/guide/en/apm/server/6.4 -:apm-server-ref-62: https://www.elastic.co/guide/en/apm/server/6.2 +:apm-overview-ref: https://www.elastic.co/guide/en/apm/get-started/{branch} +:apm-server-ref: https://www.elastic.co/guide/en/apm/server/{branch} :apm-agents-ref: https://www.elastic.co/guide/en/apm/agent :apm-dotnet-ref: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch} :apm-go-ref: https://www.elastic.co/guide/en/apm/agent/go/{apm-go-branch} @@ -42,7 +38,12 @@ :apm-go-ref-v: https://www.elastic.co/guide/en/apm/agent/go/{apm-go-branch} :apm-dotnet-ref-v: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch} :apm-get-started-ref: https://www.elastic.co/guide/en/apm/get-started/{branch} -:apm-server-ref: https://www.elastic.co/guide/en/apm/server/{branch} +:apm-server-ref-v: https://www.elastic.co/guide/en/apm/server/{branch} +:apm-server-ref-70: https://www.elastic.co/guide/en/apm/server/7.0 +:apm-server-ref-64: https://www.elastic.co/guide/en/apm/server/6.4 +:apm-server-ref-62: https://www.elastic.co/guide/en/apm/server/6.2 +:apm-overview-ref-v: https://www.elastic.co/guide/en/apm/get-started/{branch} +:apm-overview-ref-70: https://www.elastic.co/guide/en/apm/get-started/7.0 :apm-node-ref-index: https://www.elastic.co/guide/en/apm/agent/nodejs :apm-node-ref-1x: https://www.elastic.co/guide/en/apm/agent/nodejs/1.x // End deprecated APM attributes From 9b74a59194b24e443d66da30f508f9ad9cb097d3 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Tue, 17 Sep 2019 14:52:39 +0200 Subject: [PATCH 08/11] docs: update all the comments! --- shared/attributes.asciidoc | 8 ++++++-- shared/versions/stack/6.3.asciidoc | 4 +++- shared/versions/stack/6.4.asciidoc | 4 +++- shared/versions/stack/6.5.asciidoc | 4 +++- shared/versions/stack/6.6.asciidoc | 4 +++- shared/versions/stack/6.7.asciidoc | 4 +++- shared/versions/stack/6.8.asciidoc | 4 +++- shared/versions/stack/7.0.asciidoc | 4 +++- shared/versions/stack/7.1.asciidoc | 4 +++- shared/versions/stack/7.2.asciidoc | 4 +++- shared/versions/stack/7.3.asciidoc | 4 +++- shared/versions/stack/7.4.asciidoc | 4 +++- shared/versions/stack/7.x.asciidoc | 4 +++- shared/versions/stack/master.asciidoc | 4 +++- 14 files changed, 45 insertions(+), 15 deletions(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 41c58856bad07..3a033792c8dfa 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -28,7 +28,9 @@ :apm-py-ref: https://www.elastic.co/guide/en/apm/agent/python/{apm-py-branch} :apm-ruby-ref: https://www.elastic.co/guide/en/apm/agent/ruby/{apm-ruby-branch} :apm-rum-ref: https://www.elastic.co/guide/en/apm/agent/rum-js/{apm-rum-branch} -// Begin deprecated APM attributes +//// +Begin deprecated APM attributes +//// :apm-py-ref-v: https://www.elastic.co/guide/en/apm/agent/python/{apm-py-branch} :apm-py-ref-3x: https://www.elastic.co/guide/en/apm/agent/python/3.x :apm-node-ref-v: https://www.elastic.co/guide/en/apm/agent/nodejs/{apm-node-branch} @@ -46,7 +48,9 @@ :apm-overview-ref-70: https://www.elastic.co/guide/en/apm/get-started/7.0 :apm-node-ref-index: https://www.elastic.co/guide/en/apm/agent/nodejs :apm-node-ref-1x: https://www.elastic.co/guide/en/apm/agent/nodejs/1.x -// End deprecated APM attributes +//// +End deprecated APM attributes +//// :hadoop-ref: https://www.elastic.co/guide/en/elasticsearch/hadoop/{branch} :stack-ref: http://www.elastic.co/guide/en/elastic-stack/{branch} :stack-ref-67: http://www.elastic.co/guide/en/elastic-stack/6.7 diff --git a/shared/versions/stack/6.3.asciidoc b/shared/versions/stack/6.3.asciidoc index 871a8657345eb..21c3f68580a81 100644 --- a/shared/versions/stack/6.3.asciidoc +++ b/shared/versions/stack/6.3.asciidoc @@ -13,7 +13,9 @@ release-state can be: released | prerelease | unreleased :release-state: released -// APM Agent versions +//// +APM Agent versions +//// :apm-rum-branch: 0.x :apm-node-branch: 1.x :apm-py-branch: 3.x diff --git a/shared/versions/stack/6.4.asciidoc b/shared/versions/stack/6.4.asciidoc index 02242ca90b4db..31bc0e077cfdf 100644 --- a/shared/versions/stack/6.4.asciidoc +++ b/shared/versions/stack/6.4.asciidoc @@ -13,7 +13,9 @@ release-state can be: released | prerelease | unreleased :release-state: released -// APM Agent versions +//// +APM Agent versions +//// :apm-rum-branch: 0.x :apm-node-branch: 1.x :apm-py-branch: 3.x diff --git a/shared/versions/stack/6.5.asciidoc b/shared/versions/stack/6.5.asciidoc index 1dff3cd898118..74ae1fb3454ba 100644 --- a/shared/versions/stack/6.5.asciidoc +++ b/shared/versions/stack/6.5.asciidoc @@ -13,7 +13,9 @@ release-state can be: released | prerelease | unreleased :release-state: released -// APM Agent versions +//// +APM Agent versions +//// :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 2.x diff --git a/shared/versions/stack/6.6.asciidoc b/shared/versions/stack/6.6.asciidoc index 260ddde54239d..c4034ef79e0a0 100644 --- a/shared/versions/stack/6.6.asciidoc +++ b/shared/versions/stack/6.6.asciidoc @@ -13,7 +13,9 @@ release-state can be: released | prerelease | unreleased :release-state: released -// APM Agent versions +//// +APM Agent versions +//// :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 3.x diff --git a/shared/versions/stack/6.7.asciidoc b/shared/versions/stack/6.7.asciidoc index 06dc3c61d20e9..6f3f61d0c31b5 100644 --- a/shared/versions/stack/6.7.asciidoc +++ b/shared/versions/stack/6.7.asciidoc @@ -13,7 +13,9 @@ release-state can be: released | prerelease | unreleased :release-state: released -// APM Agent versions +//// +APM Agent versions +//// :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 4.x diff --git a/shared/versions/stack/6.8.asciidoc b/shared/versions/stack/6.8.asciidoc index 1af0e8cdc336c..214afd81fc981 100644 --- a/shared/versions/stack/6.8.asciidoc +++ b/shared/versions/stack/6.8.asciidoc @@ -17,7 +17,9 @@ release-state can be: released | prerelease | unreleased :release-state: released -// APM Agent versions +//// +APM Agent versions +//// :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 4.x diff --git a/shared/versions/stack/7.0.asciidoc b/shared/versions/stack/7.0.asciidoc index 4a1dde6e2dd87..4a0b9e2ce413d 100644 --- a/shared/versions/stack/7.0.asciidoc +++ b/shared/versions/stack/7.0.asciidoc @@ -18,7 +18,9 @@ release-state can be: released | prerelease | unreleased :release-state: released -// APM Agent versions +//// +APM Agent versions +//// :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 4.x diff --git a/shared/versions/stack/7.1.asciidoc b/shared/versions/stack/7.1.asciidoc index 8268ed46a2c4e..589154e228d63 100644 --- a/shared/versions/stack/7.1.asciidoc +++ b/shared/versions/stack/7.1.asciidoc @@ -18,7 +18,9 @@ release-state can be: released | prerelease | unreleased :release-state: released -// APM Agent versions +//// +APM Agent versions +//// :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 4.x diff --git a/shared/versions/stack/7.2.asciidoc b/shared/versions/stack/7.2.asciidoc index 0e7e86fcf65ec..6c4d1eaffdd39 100644 --- a/shared/versions/stack/7.2.asciidoc +++ b/shared/versions/stack/7.2.asciidoc @@ -18,7 +18,9 @@ release-state can be: released | prerelease | unreleased :release-state: released -// APM Agent versions +//// +APM Agent versions +//// :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 4.x diff --git a/shared/versions/stack/7.3.asciidoc b/shared/versions/stack/7.3.asciidoc index ecf9a487aaabe..3afd43c357f64 100644 --- a/shared/versions/stack/7.3.asciidoc +++ b/shared/versions/stack/7.3.asciidoc @@ -18,7 +18,9 @@ release-state can be: released | prerelease | unreleased :release-state: released -// APM Agent versions +//// +APM Agent versions +//// :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 4.x diff --git a/shared/versions/stack/7.4.asciidoc b/shared/versions/stack/7.4.asciidoc index 88a5d8a4ed0b3..7174cc7b32e89 100644 --- a/shared/versions/stack/7.4.asciidoc +++ b/shared/versions/stack/7.4.asciidoc @@ -18,7 +18,9 @@ release-state can be: released | prerelease | unreleased :release-state: unreleased -// APM Agent versions +//// +APM Agent versions +//// :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 4.x diff --git a/shared/versions/stack/7.x.asciidoc b/shared/versions/stack/7.x.asciidoc index a86241d32f839..95b755b165031 100644 --- a/shared/versions/stack/7.x.asciidoc +++ b/shared/versions/stack/7.x.asciidoc @@ -18,7 +18,9 @@ release-state can be: released | prerelease | unreleased :release-state: unreleased -// APM Agent versions +//// +APM Agent versions +//// :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 4.x diff --git a/shared/versions/stack/master.asciidoc b/shared/versions/stack/master.asciidoc index c33ffb9114e8d..a19bd63578a13 100644 --- a/shared/versions/stack/master.asciidoc +++ b/shared/versions/stack/master.asciidoc @@ -18,7 +18,9 @@ release-state can be: released | prerelease | unreleased :release-state: unreleased -// APM Agent versions +//// +APM Agent versions +//// :apm-go-branch: 1.x :apm-java-branch: 1.x :apm-rum-branch: 4.x From 3519dd934de87a1ba3c8649136b359f36762a788 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Thu, 19 Sep 2019 15:27:57 +0200 Subject: [PATCH 09/11] docs: dont change -v branch --- shared/attributes.asciidoc | 61 +++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 3a033792c8dfa..0787e372d1b35 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -18,39 +18,16 @@ :winlogbeat-ref: https://www.elastic.co/guide/en/beats/winlogbeat/{branch} :heartbeat-ref: https://www.elastic.co/guide/en/beats/heartbeat/{branch} :journalbeat-ref: https://www.elastic.co/guide/en/beats/journalbeat/{branch} -:apm-overview-ref: https://www.elastic.co/guide/en/apm/get-started/{branch} -:apm-server-ref: https://www.elastic.co/guide/en/apm/server/{branch} +:apm-overview-ref-v: https://www.elastic.co/guide/en/apm/get-started/{branch} +:apm-server-ref-v: https://www.elastic.co/guide/en/apm/server/{branch} :apm-agents-ref: https://www.elastic.co/guide/en/apm/agent -:apm-dotnet-ref: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch} -:apm-go-ref: https://www.elastic.co/guide/en/apm/agent/go/{apm-go-branch} -:apm-java-ref: https://www.elastic.co/guide/en/apm/agent/java/{apm-java-branch} -:apm-node-ref: https://www.elastic.co/guide/en/apm/agent/nodejs/{apm-node-branch} -:apm-py-ref: https://www.elastic.co/guide/en/apm/agent/python/{apm-py-branch} -:apm-ruby-ref: https://www.elastic.co/guide/en/apm/agent/ruby/{apm-ruby-branch} -:apm-rum-ref: https://www.elastic.co/guide/en/apm/agent/rum-js/{apm-rum-branch} -//// -Begin deprecated APM attributes -//// -:apm-py-ref-v: https://www.elastic.co/guide/en/apm/agent/python/{apm-py-branch} -:apm-py-ref-3x: https://www.elastic.co/guide/en/apm/agent/python/3.x +:apm-dotnet-ref-v: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch} +:apm-go-ref-v: https://www.elastic.co/guide/en/apm/agent/go/{apm-go-branch} +:apm-java-ref-v: https://www.elastic.co/guide/en/apm/agent/java/{apm-java-branch} :apm-node-ref-v: https://www.elastic.co/guide/en/apm/agent/nodejs/{apm-node-branch} -:apm-rum-ref-v: https://www.elastic.co/guide/en/apm/agent/rum-js/{apm-rum-branch} +:apm-py-ref-v: https://www.elastic.co/guide/en/apm/agent/python/{apm-py-branch} :apm-ruby-ref-v: https://www.elastic.co/guide/en/apm/agent/ruby/{apm-ruby-branch} -:apm-java-ref-v: https://www.elastic.co/guide/en/apm/agent/java/{apm-java-branch} -:apm-go-ref-v: https://www.elastic.co/guide/en/apm/agent/go/{apm-go-branch} -:apm-dotnet-ref-v: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch} -:apm-get-started-ref: https://www.elastic.co/guide/en/apm/get-started/{branch} -:apm-server-ref-v: https://www.elastic.co/guide/en/apm/server/{branch} -:apm-server-ref-70: https://www.elastic.co/guide/en/apm/server/7.0 -:apm-server-ref-64: https://www.elastic.co/guide/en/apm/server/6.4 -:apm-server-ref-62: https://www.elastic.co/guide/en/apm/server/6.2 -:apm-overview-ref-v: https://www.elastic.co/guide/en/apm/get-started/{branch} -:apm-overview-ref-70: https://www.elastic.co/guide/en/apm/get-started/7.0 -:apm-node-ref-index: https://www.elastic.co/guide/en/apm/agent/nodejs -:apm-node-ref-1x: https://www.elastic.co/guide/en/apm/agent/nodejs/1.x -//// -End deprecated APM attributes -//// +:apm-rum-ref-v: https://www.elastic.co/guide/en/apm/agent/rum-js/{apm-rum-branch} :hadoop-ref: https://www.elastic.co/guide/en/elasticsearch/hadoop/{branch} :stack-ref: http://www.elastic.co/guide/en/elastic-stack/{branch} :stack-ref-67: http://www.elastic.co/guide/en/elastic-stack/6.7 @@ -218,3 +195,27 @@ End deprecated APM attributes :api-example-title: Example :api-examples-title: Examples :api-definitions-title: Properties + +//// +Begin deprecated APM attributes +//// +:apm-overview-ref: https://www.elastic.co/guide/en/apm/get-started/{branch} +:apm-overview-ref-70: https://www.elastic.co/guide/en/apm/get-started/7.0 +:apm-get-started-ref: https://www.elastic.co/guide/en/apm/get-started/{branch} +:apm-server-ref: https://www.elastic.co/guide/en/apm/server/{branch} +:apm-server-ref-70: https://www.elastic.co/guide/en/apm/server/7.0 +:apm-server-ref-64: https://www.elastic.co/guide/en/apm/server/6.4 +:apm-server-ref-62: https://www.elastic.co/guide/en/apm/server/6.2 +:apm-dotnet-ref: https://www.elastic.co/guide/en/apm/agent/dotnet/{branch} +:apm-go-ref: https://www.elastic.co/guide/en/apm/agent/go/{branch} +:apm-java-ref: https://www.elastic.co/guide/en/apm/agent/java/{branch} +:apm-node-ref: https://www.elastic.co/guide/en/apm/agent/nodejs/{branch} +:apm-node-ref-index: https://www.elastic.co/guide/en/apm/agent/nodejs +:apm-node-ref-1x: https://www.elastic.co/guide/en/apm/agent/nodejs/1.x +:apm-py-ref: https://www.elastic.co/guide/en/apm/agent/python/{branch} +:apm-py-ref-3x: https://www.elastic.co/guide/en/apm/agent/python/3.x +:apm-ruby-ref: https://www.elastic.co/guide/en/apm/agent/ruby/{branch} +:apm-rum-ref: https://www.elastic.co/guide/en/apm/agent/rum-js/{branch} +//// +End deprecated APM attributes +//// From 26eb41c6d2d53d59fa0d85667a91a3d67d583bcf Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Fri, 20 Sep 2019 10:20:22 +0200 Subject: [PATCH 10/11] revert changed attributes --- shared/attributes.asciidoc | 47 +++++++++++++------------------------- 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 0787e372d1b35..e569f4a4f16ef 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -18,16 +18,25 @@ :winlogbeat-ref: https://www.elastic.co/guide/en/beats/winlogbeat/{branch} :heartbeat-ref: https://www.elastic.co/guide/en/beats/heartbeat/{branch} :journalbeat-ref: https://www.elastic.co/guide/en/beats/journalbeat/{branch} +:apm-get-started-ref: https://www.elastic.co/guide/en/apm/get-started/{branch} :apm-overview-ref-v: https://www.elastic.co/guide/en/apm/get-started/{branch} +:apm-overview-ref-70: https://www.elastic.co/guide/en/apm/get-started/7.0 +:apm-server-ref: https://www.elastic.co/guide/en/apm/server/{branch} :apm-server-ref-v: https://www.elastic.co/guide/en/apm/server/{branch} +:apm-server-ref-62: https://www.elastic.co/guide/en/apm/server/6.2 +:apm-server-ref-64: https://www.elastic.co/guide/en/apm/server/6.4 +:apm-server-ref-70: https://www.elastic.co/guide/en/apm/server/7.0 :apm-agents-ref: https://www.elastic.co/guide/en/apm/agent -:apm-dotnet-ref-v: https://www.elastic.co/guide/en/apm/agent/dotnet/{apm-dotnet-branch} -:apm-go-ref-v: https://www.elastic.co/guide/en/apm/agent/go/{apm-go-branch} -:apm-java-ref-v: https://www.elastic.co/guide/en/apm/agent/java/{apm-java-branch} -:apm-node-ref-v: https://www.elastic.co/guide/en/apm/agent/nodejs/{apm-node-branch} -:apm-py-ref-v: https://www.elastic.co/guide/en/apm/agent/python/{apm-py-branch} -:apm-ruby-ref-v: https://www.elastic.co/guide/en/apm/agent/ruby/{apm-ruby-branch} -:apm-rum-ref-v: https://www.elastic.co/guide/en/apm/agent/rum-js/{apm-rum-branch} +:apm-py-ref: https://www.elastic.co/guide/en/apm/agent/python/current +:apm-py-ref-3x: https://www.elastic.co/guide/en/apm/agent/python/3.x +:apm-node-ref-index: https://www.elastic.co/guide/en/apm/agent/nodejs +:apm-node-ref: https://www.elastic.co/guide/en/apm/agent/nodejs/current +:apm-node-ref-1x: https://www.elastic.co/guide/en/apm/agent/nodejs/1.x +:apm-rum-ref: https://www.elastic.co/guide/en/apm/agent/rum-js/current +:apm-ruby-ref: https://www.elastic.co/guide/en/apm/agent/ruby/current +:apm-java-ref: https://www.elastic.co/guide/en/apm/agent/java/current +:apm-go-ref: https://www.elastic.co/guide/en/apm/agent/go/current +:apm-dotnet-ref: https://www.elastic.co/guide/en/apm/agent/dotnet/current :hadoop-ref: https://www.elastic.co/guide/en/elasticsearch/hadoop/{branch} :stack-ref: http://www.elastic.co/guide/en/elastic-stack/{branch} :stack-ref-67: http://www.elastic.co/guide/en/elastic-stack/6.7 @@ -195,27 +204,3 @@ :api-example-title: Example :api-examples-title: Examples :api-definitions-title: Properties - -//// -Begin deprecated APM attributes -//// -:apm-overview-ref: https://www.elastic.co/guide/en/apm/get-started/{branch} -:apm-overview-ref-70: https://www.elastic.co/guide/en/apm/get-started/7.0 -:apm-get-started-ref: https://www.elastic.co/guide/en/apm/get-started/{branch} -:apm-server-ref: https://www.elastic.co/guide/en/apm/server/{branch} -:apm-server-ref-70: https://www.elastic.co/guide/en/apm/server/7.0 -:apm-server-ref-64: https://www.elastic.co/guide/en/apm/server/6.4 -:apm-server-ref-62: https://www.elastic.co/guide/en/apm/server/6.2 -:apm-dotnet-ref: https://www.elastic.co/guide/en/apm/agent/dotnet/{branch} -:apm-go-ref: https://www.elastic.co/guide/en/apm/agent/go/{branch} -:apm-java-ref: https://www.elastic.co/guide/en/apm/agent/java/{branch} -:apm-node-ref: https://www.elastic.co/guide/en/apm/agent/nodejs/{branch} -:apm-node-ref-index: https://www.elastic.co/guide/en/apm/agent/nodejs -:apm-node-ref-1x: https://www.elastic.co/guide/en/apm/agent/nodejs/1.x -:apm-py-ref: https://www.elastic.co/guide/en/apm/agent/python/{branch} -:apm-py-ref-3x: https://www.elastic.co/guide/en/apm/agent/python/3.x -:apm-ruby-ref: https://www.elastic.co/guide/en/apm/agent/ruby/{branch} -:apm-rum-ref: https://www.elastic.co/guide/en/apm/agent/rum-js/{branch} -//// -End deprecated APM attributes -//// From 5368b7c79366ef84357cef0954e6cd9e515da647 Mon Sep 17 00:00:00 2001 From: Brandon Morelli Date: Fri, 20 Sep 2019 10:21:48 +0200 Subject: [PATCH 11/11] docs: fix line --- shared/attributes.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index e569f4a4f16ef..64db5715e726b 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -204,3 +204,4 @@ :api-example-title: Example :api-examples-title: Examples :api-definitions-title: Properties +