diff --git a/shared/attributes.asciidoc b/shared/attributes.asciidoc index 9b6b624cd7d60..64db5715e726b 100644 --- a/shared/attributes.asciidoc +++ b/shared/attributes.asciidoc @@ -204,4 +204,4 @@ :api-example-title: Example :api-examples-title: Examples :api-definitions-title: Properties - + 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 9790253bd9900..21c3f68580a81 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 @@ -11,3 +12,10 @@ 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..31bc0e077cfdf 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 @@ -11,3 +12,10 @@ 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..74ae1fb3454ba 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 @@ -11,3 +12,14 @@ 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 +:apm-dotnet-branch: 1.x diff --git a/shared/versions/stack/6.6.asciidoc b/shared/versions/stack/6.6.asciidoc index 5c1627f4f23cf..c4034ef79e0a0 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 @@ -11,3 +12,14 @@ 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: 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 ec2a5af978591..6f3f61d0c31b5 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 @@ -11,3 +12,14 @@ 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: 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 43dc7a1c70a93..214afd81fc981 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 @@ -15,3 +16,14 @@ 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: 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 0b61d9d976e6d..4a0b9e2ce413d 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 @@ -16,3 +17,14 @@ 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: 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 69c789748c77c..589154e228d63 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 @@ -16,3 +17,14 @@ 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: 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 88ed76e55e1ed..6c4d1eaffdd39 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 @@ -16,3 +17,14 @@ 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: 5.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..3afd43c357f64 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 @@ -15,4 +16,15 @@ 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..7174cc7b32e89 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 @@ -16,3 +17,14 @@ 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..95b755b165031 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 @@ -16,3 +17,14 @@ 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..a19bd63578a13 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 @@ -17,3 +18,13 @@ 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